felipe Wed Aug 27 01:02:58 2008 UTC Added files: /php-src/ext/fileinfo/tests finfo_open_001.phpt
Modified files: /php-src/ext/fileinfo fileinfo.c Log: - Fixed check for empty file name http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/fileinfo.c?r1=1.25&r2=1.26&diff_format=u Index: php-src/ext/fileinfo/fileinfo.c diff -u php-src/ext/fileinfo/fileinfo.c:1.25 php-src/ext/fileinfo/fileinfo.c:1.26 --- php-src/ext/fileinfo/fileinfo.c:1.25 Tue Aug 26 16:19:28 2008 +++ php-src/ext/fileinfo/fileinfo.c Wed Aug 27 01:02:58 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fileinfo.c,v 1.25 2008/08/26 16:19:28 felipe Exp $ */ +/* $Id: fileinfo.c,v 1.26 2008/08/27 01:02:58 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -316,7 +316,7 @@ RETURN_FALSE; } - if (file_len) { /* user specified filed, perform open_basedir checks */ + if (*file) { /* user specified filed, perform open_basedir checks */ if (!VCWD_REALPATH(file, resolved_path)) { RETURN_FALSE; } http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/tests/finfo_open_001.phpt?view=markup&rev=1.1 Index: php-src/ext/fileinfo/tests/finfo_open_001.phpt +++ php-src/ext/fileinfo/tests/finfo_open_001.phpt --TEST-- finfo_open(): Testing magic_file names --FILE-- <?php var_dump(finfo_open(FILEINFO_MIME, "\0")); var_dump(finfo_open(FILEINFO_MIME, NULL)); var_dump(finfo_open(FILEINFO_MIME, '')); var_dump(finfo_open(FILEINFO_MIME, 123)); var_dump(finfo_open(FILEINFO_MIME, 1.0)); var_dump(finfo_open(FILEINFO_MIME, '/foo/bar/inexistent')); ?> --EXPECTF-- Warning: finfo_open(): Failed to load magic database at ''. in %s on line %d bool(false) Warning: finfo_open(): Failed to load magic database at ''. in %s on line %d bool(false) Warning: finfo_open(): Failed to load magic database at ''. in %s on line %d bool(false) bool(false) bool(false) bool(false) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php