Fixed bug #65136 (RecursiveDirectoryIterator segfault)

diff --git a/NEWS b/NEWS
index c7e4c580f0edc37abe1c28b1b4dafac22c57fadb..a4295e8c5269b941c85ac6bcd47b8022505c39f9 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -42,6 +42,7 @@ PHP                                                                        NEWS
     (Damjan Cvetko)
 
 - SPL:
+  . Fixed bug #65136 (RecursiveDirectoryIterator segfault). (Laruence)
   . Fixed bug #61828 (Memleak when calling Directory(Recursive)Iterator
     /Spl(Temp)FileObject ctor twice). (Laruence)
 

diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
index 056e7e4f103ae3a023b36887b545c83f0b737288..7f0ce631b10b98a7571c32691d444f08d9659d2a 100644 (file)
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
@@ -1510,7 +1510,7 @@ SPL_METHOD(RecursiveDirectoryIterator, hasChildren)
    Returns an iterator for the current entry if it is a directory */
 SPL_METHOD(RecursiveDirectoryIterator, getChildren)
 {
-       zval zpath, zflags;
+       zval *zpath, *zflags;
        spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
        spl_filesystem_object *subdir;
        char slash = SPL_HAS_FLAG(intern->flags, SPL_FILE_DIR_UNIXPATHS) ? '/' : DEFAULT_SLASH;
@@ -1524,11 +1524,13 @@ SPL_METHOD(RecursiveDirectoryIterator, getChildren)
        if (SPL_HAS_FLAG(intern->flags, SPL_FILE_DIR_CURRENT_AS_PATHNAME)) {
                RETURN_STRINGL(intern->file_name, intern->file_name_len, 1);
        } else {
-               INIT_PZVAL(&zflags);
-               INIT_PZVAL(&zpath);
-               ZVAL_LONG(&zflags, intern->flags);
-               ZVAL_STRINGL(&zpath, intern->file_name, intern->file_name_len, 0);
-               spl_instantiate_arg_ex2(Z_OBJCE_P(getThis()), &return_value, 0, &zpath, &zflags TSRMLS_CC);
+               MAKE_STD_ZVAL(zflags);
+               MAKE_STD_ZVAL(zpath);
+               ZVAL_LONG(zflags, intern->flags);
+               ZVAL_STRINGL(zpath, intern->file_name, intern->file_name_len, 1);
+               spl_instantiate_arg_ex2(Z_OBJCE_P(getThis()), &return_value, 0, zpath, zflags TSRMLS_CC);
+               zval_ptr_dtor(&zpath);
+               zval_ptr_dtor(&zflags);
                
                subdir = (spl_filesystem_object*)zend_object_store_get_object(return_value TSRMLS_CC);
                if (subdir) {