]> granicus.if.org Git - php/commitdiff
MFH: adapt check for __construct bypass
authorEtienne Kneuss <colder@php.net>
Thu, 8 Sep 2011 23:10:40 +0000 (23:10 +0000)
committerEtienne Kneuss <colder@php.net>
Thu, 8 Sep 2011 23:10:40 +0000 (23:10 +0000)
ext/spl/spl_directory.c

index abc83348f1ce1b0a522eb21f50f9e045be2654ce..209d2aeb07fb456c4ab1d4178578c91717ae7951 100755 (executable)
@@ -644,6 +644,7 @@ static int spl_filesystem_object_constructor_validator(void *object_data TSRMLS_
         * constructor or cleared its exception */
        
        return (fsobj->u.dir.entry.d_name[0] != '\0' /* GlobIterator */ ||
+                       fsobj->_path != NULL /* SplFileInfo */ ||
                        fsobj->orig_path != NULL /* Spl[Temp]FileObject */);
 }
 /* }}} */