]> granicus.if.org Git - php/commitdiff
MFH: Fix #44511 (Ensure no exception was already thrown by php_stream_opendir)
authorEtienne Kneuss <colder@php.net>
Wed, 9 Apr 2008 19:01:12 +0000 (19:01 +0000)
committerEtienne Kneuss <colder@php.net>
Wed, 9 Apr 2008 19:01:12 +0000 (19:01 +0000)
ext/spl/spl_directory.c

index 96fc5e781b3d8c3e9804e02a1ca21cc9e302513a..41328c20cc022cb92a288e02c4cff01b7eaf2d81 100755 (executable)
@@ -215,7 +215,7 @@ static void spl_filesystem_dir_open(spl_filesystem_object* intern, char *path TS
        }
        intern->u.dir.index = 0;
 
-       if (intern->u.dir.dirp == NULL) {
+       if (EG(exception) || intern->u.dir.dirp == NULL) {
                /* throw exception: should've been already happened */
                intern->u.dir.entry.d_name[0] = '\0';
        } else {