[pypy-commit] pypy py3.6: From PR #615: be more careful when calling closedir()

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: py3.6
Changeset: r94717:77ccc18f0391
Date: 2018-06-01 09:02 +0200
http://bitbucket.org/pypy/pypy/changeset/77ccc18f0391/

Log:	From PR #615: be more careful when calling closedir()

diff --git a/pypy/module/posix/interp_scandir.py b/pypy/module/posix/interp_scandir.py
--- a/pypy/module/posix/interp_scandir.py
+++ b/pypy/module/posix/interp_scandir.py
@@ -79,8 +79,10 @@
         self._close()
 
     def _close(self):
-        rposix_scandir.closedir(self.dirp)
-        self.dirp = rposix_scandir.NULL_DIRP
+        dirp = self.dirp
+        if dirp:
+            self.dirp = rposix_scandir.NULL_DIRP
+            rposix_scandir.closedir(dirp)
 
     def iter_w(self):
         return self