iliaa Mon Jan 23 15:24:41 2006 UTC
Modified files:
/php-src/ext/spl spl_directory.c
Log:
MFB51: Fixed bug #36134 (DirectoryIterator constructor failed to detect
empty directory names).
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_directory.c?r1=1.65&r2=1.66&diff_format=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.65
php-src/ext/spl/spl_directory.c:1.66
--- php-src/ext/spl/spl_directory.c:1.65 Sun Jan 15 00:17:08 2006
+++ php-src/ext/spl/spl_directory.c Mon Jan 23 15:24:41 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_directory.c,v 1.65 2006/01/15 00:17:08 helly Exp $ */
+/* $Id: spl_directory.c,v 1.66 2006/01/23 15:24:41 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -393,6 +393,12 @@
return;
}
+ if (!len) {
+ php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
+ zend_throw_exception_ex(spl_ce_RuntimeException, 0 TSRMLS_CC,
"Directory name must not be empty.");
+ return;
+ }
+
intern = (spl_filesystem_object*)zend_object_store_get_object(getThis()
TSRMLS_CC);
spl_filesystem_dir_open(intern, path TSRMLS_CC);
intern->u.dir.is_recursive = instanceof_function(intern->std.ce,
U_CLASS_ENTRY(spl_ce_RecursiveDirectoryIterator) TSRMLS_CC) ? 1 : 0;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
