Fix bug #47534 (RecursiveDirectoryIterator::getChildren ignoring CURRENT_AS_PATHNAME)

diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
index 97846044516044fe74fce2e15161665ee0245d58..893769f2c758ccf27d4186766c6292bddc84ddd9 100755 (executable)
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
@@ -1386,28 +1386,32 @@ SPL_METHOD(RecursiveDirectoryIterator, getChildren)
        
        spl_filesystem_object_get_file_name(intern TSRMLS_CC);
 
-       INIT_PZVAL(&zflags);
-       INIT_PZVAL(&zpath);
-       ZVAL_LONG(&zflags, intern->flags);
-       ZVAL_ZSTRL(&zpath, intern->file_name_type, intern->file_name, intern->file_name_len, 1);
+       if (SPL_HAS_FLAG(intern->flags, SPL_FILE_DIR_CURRENT_AS_PATHNAME)) {
+               RETURN_ZSTRL(intern->file_name_type, intern->file_name, intern->file_name_len, 1);
+       } else {
+               INIT_PZVAL(&zflags);
+               INIT_PZVAL(&zpath);
+               ZVAL_LONG(&zflags, intern->flags);
+               ZVAL_ZSTRL(&zpath, intern->file_name_type, intern->file_name, intern->file_name_len, 1);
 
-       spl_instantiate_arg_ex2(Z_OBJCE_P(getThis()), &return_value, 0, &zpath, &zflags TSRMLS_CC);
+               spl_instantiate_arg_ex2(Z_OBJCE_P(getThis()), &return_value, 0, &zpath, &zflags TSRMLS_CC);
 
-       zval_dtor(&zpath);
+               zval_dtor(&zpath);
 
-       subdir = (spl_filesystem_object*)zend_object_store_get_object(return_value TSRMLS_CC);
-       if (subdir) {
-               if (intern->u.dir.sub_path.v && intern->u.dir.sub_path_len > 1) {
-                       subdir->u.dir.sub_path_type = intern->u.dir.sub_path_type;
-                       subdir->u.dir.sub_path_len = zspprintf(intern->u.dir.sub_path_type, &subdir->u.dir.sub_path, 0, "%R%c%s", intern->u.dir.sub_path_type, intern->u.dir.sub_path, slash, intern->u.dir.entry.d_name);
-               } else {
-                       subdir->u.dir.sub_path_len = strlen(intern->u.dir.entry.d_name);
-                       subdir->u.dir.sub_path_type = IS_STRING;
-                       subdir->u.dir.sub_path.s = estrndup(intern->u.dir.entry.d_name, subdir->u.dir.sub_path_len);
+               subdir = (spl_filesystem_object*)zend_object_store_get_object(return_value TSRMLS_CC);
+               if (subdir) {
+                       if (intern->u.dir.sub_path.v && intern->u.dir.sub_path_len > 1) {
+                               subdir->u.dir.sub_path_type = intern->u.dir.sub_path_type;
+                               subdir->u.dir.sub_path_len = zspprintf(intern->u.dir.sub_path_type, &subdir->u.dir.sub_path, 0, "%R%c%s", intern->u.dir.sub_path_type, intern->u.dir.sub_path, slash, intern->u.dir.entry.d_name);
+                       } else {
+                               subdir->u.dir.sub_path_len = strlen(intern->u.dir.entry.d_name);
+                               subdir->u.dir.sub_path_type = IS_STRING;
+                               subdir->u.dir.sub_path.s = estrndup(intern->u.dir.entry.d_name, subdir->u.dir.sub_path_len);
+                       }
+                       subdir->info_class = intern->info_class;
+                       subdir->file_class = intern->file_class;
+                       subdir->oth = intern->oth;
                }
-               subdir->info_class = intern->info_class;
-               subdir->file_class = intern->file_class;
-               subdir->oth = intern->oth;
        }
 }
 /* }}} */

diff --git a/ext/spl/tests/bug47534.phpt b/ext/spl/tests/bug47534.phpt
new file mode 100644 (file)
index 0000000..97ff518
--- /dev/null
+++ b/ext/spl/tests/bug47534.phpt
@@ -0,0 +1,14 @@
+--TEST--
+SPL: RecursiveDirectoryIterator bug 47534
+--FILE--
+<?php
+$it1 = new RecursiveDirectoryIterator(dirname(__FILE__), FileSystemIterator::CURRENT_AS_PATHNAME);
+$it1->rewind();
+echo gettype($it1->current())."\n";
+
+$it2 = new RecursiveDirectoryIterator(dirname(__FILE__));
+$it2->rewind();
+echo gettype($it2->current())."\n";
+--EXPECT--
+unicode
+object