cvs: php-src(PHP_5_2) /ext/spl spl_directory.c
| From: | Ilia Alshanetsky | Date: | Sat, 22 Sep 2007 15:55:36 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /ext/spl spl_directory.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-46282@lists.php.net to get a copy of this message | ||
iliaa Sat Sep 22 15:55:36 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/spl spl_directory.c
Log:
Improve check for filename (fixed coverity issue #355)
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.c?r1=1.45.2.27.2.22&r2=1.45.2.27.2.23&diff_format=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.45.2.27.2.22
php-src/ext/spl/spl_directory.c:1.45.2.27.2.23
--- php-src/ext/spl/spl_directory.c:1.45.2.27.2.22 Tue Aug 21 22:45:53 2007
+++ php-src/ext/spl/spl_directory.c Sat Sep 22 15:55:35 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_directory.c,v 1.45.2.27.2.22 2007/08/21 22:45:53 johannes Exp $ */
+/* $Id: spl_directory.c,v 1.45.2.27.2.23 2007/09/22 15:55:35 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -862,7 +862,7 @@
spl_filesystem_object_get_file_name(intern TSRMLS_CC);
}
- if (intern->file_name_len && VCWD_REALPATH(intern->file_name, buff)) {
+ if (intern->file_name && VCWD_REALPATH(intern->file_name, buff)) {
#ifdef ZTS
if (VCWD_ACCESS(buff, F_OK)) {
RETVAL_FALSE;