MFH: Fix #44511 (Ensure no exception was already thrown by php_stream…

…_opendir)
php · Apr 9, 2008 · 54b70b6 · 54b70b6
1 parent e3040a0
commit 54b70b6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
@@ -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 {