- Fixed bug #54291 (Crash iterating DirectoryIterator for dir name starting

  with \0).


git-svn-id: http://svn.php.net/repository/php/php-src/php/php-src/trunk@309456 c90b9560-bf6c-de11-be94-00142212c4b1

Author: cataphract

ext/spl/spl_directory.c

@@ -232,8 +232,12 @@ static void spl_filesystem_dir_open(spl_filesystem_object* intern, char *path TS
 	intern->u.dir.index = 0;
 
 	if (EG(exception) || intern->u.dir.dirp == NULL) {
-		/* throw exception: should've been already happened */
 		intern->u.dir.entry.d_name[0] = '\0';
+		if (!EG(exception)) {
+			/* open failed w/out notice (turned to exception due to EH_THROW) */
+			zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0
+				TSRMLS_CC, "Failed to open directory \"%s\"", path);
+		}
 	} else {
 		do {
 			spl_filesystem_dir_read(intern TSRMLS_CC);

ext/spl/tests/bug54291.phpt

@@ -0,0 +1,13 @@
+--TEST--
+Bug #54291 (Crash iterating DirectoryIterator for dir name starting with \0)
+--FILE--
+<?php
+$dir = new DirectoryIterator("\x00/abc");
+$dir->isFile();
+--EXPECTF--
+Fatal error: Uncaught exception 'UnexpectedValueException' with message 'Failed to open directory ""' in %s:%d
+Stack trace:
+#0 %s(%d): DirectoryIterator->__construct('?/abc')
+#1 {main}
+  thrown in %s on line %d
+