Browse Source

- Fixed bug #51732, Fileinfo __construct or open does not work with NULL

experimental/lemon
Pierre Joye 16 years ago
parent
commit
cdadeed834
  1. 4
      ext/fileinfo/fileinfo.c
  2. 8
      ext/fileinfo/tests/finfo_open_001.phpt

4
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;
}

8
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)
Loading…
Cancel
Save