From fdf0395e4930a0342cfef9ae6638769f12679093 Mon Sep 17 00:00:00 2001 From: Pierre Joye Date: Tue, 4 May 2010 08:48:58 +0000 Subject: [PATCH] - Fixed bug #51732, Fileinfo __construct or open does not work with NULL --- NEWS | 2 ++ ext/fileinfo/fileinfo.c | 4 +++- ext/fileinfo/tests/finfo_open_001.phpt | 8 ++------ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NEWS b/NEWS index dc0b20bfd7..0bde7a7e95 100644 --- a/NEWS +++ b/NEWS @@ -39,6 +39,8 @@ PHP NEWS requests (Fixes CVE-2010-0397, bug #51288). (Raphael Geissert) - Fixed 64-bit integer overflow in mhash_keygen_s2k(). (Clément LECIGNE, Stas) +- Fixed bug #51732 (Fileinfo __construct or open does not work with NULL). + (Pierre) - Fixed bug #51723 (Content-length header is limited to 32bit integer with Apache2 on Windows). (Pierre) - Fixed bug #51690 (Phar::setStub looks for case-sensitive diff --git a/ext/fileinfo/fileinfo.c b/ext/fileinfo/fileinfo.c index 75862e7e52..81ee428e94 100644 --- a/ext/fileinfo/fileinfo.c +++ b/ext/fileinfo/fileinfo.c @@ -291,7 +291,9 @@ PHP_FUNCTION(finfo_open) RETURN_FALSE; } - if (file && *file) { /* user specified file, perform open_basedir checks */ + if (file_len == 0) { + file = NULL; + } else if (file && *file) { /* user specified file, perform open_basedir checks */ if (!VCWD_REALPATH(file, resolved_path)) { RETURN_FALSE; } diff --git a/ext/fileinfo/tests/finfo_open_001.phpt b/ext/fileinfo/tests/finfo_open_001.phpt index 0223a381cb..69696ebe33 100644 --- a/ext/fileinfo/tests/finfo_open_001.phpt +++ b/ext/fileinfo/tests/finfo_open_001.phpt @@ -16,12 +16,8 @@ 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) +resource(%d) of type (file_info) +resource(%d) of type (file_info) bool(false) bool(false) bool(false) -- 2.40.0