svn: /php/php-src/branches/PHP_5_4/ext/spl/ spl_directory.c
| From: | Etienne Kneuss | Date: | Thu, 08 Sep 2011 23:10:40 +0000 |
| Subject: | svn: /php/php-src/branches/PHP_5_4/ext/spl/ spl_directory.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-66392@lists.php.net to get a copy of this message | ||
colder Thu, 08 Sep 2011 23:10:40 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=316434
Log:
MFH: adapt check for __construct bypass
Changed paths:
U php/php-src/branches/PHP_5_4/ext/spl/spl_directory.c
Modified: php/php-src/branches/PHP_5_4/ext/spl/spl_directory.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/spl/spl_directory.c 2011-09-08 23:07:48 UTC (rev 316433)
+++ php/php-src/branches/PHP_5_4/ext/spl/spl_directory.c 2011-09-08 23:10:40 UTC (rev 316434)
@@ -644,6 +644,7 @@
* 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 */);
}
/* }}} */