MFB51: Fixed bug #36134 (DirectoryIterator constructor failed to detect

empty directory names).
This commit is contained in:
Ilia Alshanetsky 2006-01-23 15:24:41 +00:00
parent 655d2824d4
commit 9201fa6918

View File

@ -393,6 +393,12 @@ SPL_METHOD(DirectoryIterator, __construct)
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;