[PHP-CVS] cvs: php-src(PHP_5_3) /ext/fileinfo fileinfo.c

[Antony Dovgal]

tony2001                Wed Aug 27 07:40:45 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/fileinfo       fileinfo.c 
  Log:
  fix file check and avoid segfault
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/fileinfo.c?r1=1.20.2.5&r2=1.20.2.6&diff_format=u
Index: php-src/ext/fileinfo/fileinfo.c
diff -u php-src/ext/fileinfo/fileinfo.c:1.20.2.5 
php-src/ext/fileinfo/fileinfo.c:1.20.2.6
--- php-src/ext/fileinfo/fileinfo.c:1.20.2.5    Wed Aug 27 01:04:23 2008
+++ php-src/ext/fileinfo/fileinfo.c     Wed Aug 27 07:40:44 2008
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: fileinfo.c,v 1.20.2.5 2008/08/27 01:04:23 felipe Exp $ */
+/* $Id: fileinfo.c,v 1.20.2.6 2008/08/27 07:40:44 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -316,7 +316,7 @@
                RETURN_FALSE;
        }
 
-       if (*file) { /* user specified filed, perform open_basedir checks */
+       if (file && *file) { /* user specified file, perform open_basedir 
checks */
                if (!VCWD_REALPATH(file, resolved_path)) {
                        RETURN_FALSE;
                }



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php