[PHP-CVS] cvs: php-src /ext/fileinfo fileinfo.c /ext/fileinfo/tests finfo_file_001.phpt

[Felipe Pena]

felipe          Tue Aug 26 16:19:29 2008 UTC

  Modified files:              
    /php-src/ext/fileinfo       fileinfo.c 
    /php-src/ext/fileinfo/tests finfo_file_001.phpt 
  Log:
  - Improved fix
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/fileinfo.c?r1=1.24&r2=1.25&diff_format=u
Index: php-src/ext/fileinfo/fileinfo.c
diff -u php-src/ext/fileinfo/fileinfo.c:1.24 
php-src/ext/fileinfo/fileinfo.c:1.25
--- php-src/ext/fileinfo/fileinfo.c:1.24        Tue Aug 26 15:03:33 2008
+++ php-src/ext/fileinfo/fileinfo.c     Tue Aug 26 16:19:28 2008
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: fileinfo.c,v 1.24 2008/08/26 15:03:33 felipe Exp $ */
+/* $Id: fileinfo.c,v 1.25 2008/08/26 16:19:28 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -402,7 +402,7 @@
 static void _php_finfo_get_type(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ 
*/
 {
        long options = 0;
-       char *buffer, *tmp, *ret_val;
+       char *tmp, *ret_val, *buffer = NULL;
        int buffer_len;
        struct php_fileinfo *finfo;
        zval *zfinfo, *zcontext = NULL;
@@ -449,7 +449,7 @@
                } else { /* local file */
                        char resolved_path[MAXPATHLEN];
 
-                       if (buffer_len && VCWD_REALPATH(buffer, resolved_path)) 
{
+                       if (*buffer && VCWD_REALPATH(buffer, resolved_path)) {
                                ret_val = (char *) magic_file(finfo->magic, 
buffer);
                        } else {
                                RETURN_FALSE;
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/tests/finfo_file_001.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/fileinfo/tests/finfo_file_001.phpt
diff -u php-src/ext/fileinfo/tests/finfo_file_001.phpt:1.1 
php-src/ext/fileinfo/tests/finfo_file_001.phpt:1.2
--- php-src/ext/fileinfo/tests/finfo_file_001.phpt:1.1  Tue Aug 26 15:03:33 2008
+++ php-src/ext/fileinfo/tests/finfo_file_001.phpt      Tue Aug 26 16:19:29 2008
@@ -4,6 +4,7 @@
 <?php
 
 $fp = finfo_open();
+var_dump(finfo_file($fp, "\0"));
 var_dump(finfo_file($fp, ''));
 var_dump(finfo_file($fp, NULL));
 var_dump(finfo_file($fp, '.'));
@@ -13,5 +14,6 @@
 --EXPECT--
 bool(false)
 bool(false)
+bool(false)
 string(9) "directory"
 bool(false)



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