felipe Tue Aug 26 16:22:27 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/fileinfo fileinfo.c /php-src/ext/fileinfo/tests finfo_file_001.phpt Log: - MFH: Improved fix http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/fileinfo.c?r1=1.20.2.3&r2=1.20.2.4&diff_format=u Index: php-src/ext/fileinfo/fileinfo.c diff -u php-src/ext/fileinfo/fileinfo.c:1.20.2.3 php-src/ext/fileinfo/fileinfo.c:1.20.2.4 --- php-src/ext/fileinfo/fileinfo.c:1.20.2.3 Tue Aug 26 15:06:28 2008 +++ php-src/ext/fileinfo/fileinfo.c Tue Aug 26 16:22:27 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fileinfo.c,v 1.20.2.3 2008/08/26 15:06:28 felipe Exp $ */ +/* $Id: fileinfo.c,v 1.20.2.4 2008/08/26 16:22:27 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.2.2&r2=1.1.2.3&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.2.2 php-src/ext/fileinfo/tests/finfo_file_001.phpt:1.1.2.3 --- php-src/ext/fileinfo/tests/finfo_file_001.phpt:1.1.2.2 Tue Aug 26 15:06:28 2008 +++ php-src/ext/fileinfo/tests/finfo_file_001.phpt Tue Aug 26 16:22:27 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