- Fixed check for empty file name

diff --git a/ext/fileinfo/fileinfo.c b/ext/fileinfo/fileinfo.c
index 475169166a96d5fa8278f3f20a95229907ebe69e..c0cc47e84a99d0c2f60d6b9de2bd68a3cac775e6 100644 (file)
--- a/ext/fileinfo/fileinfo.c
+++ b/ext/fileinfo/fileinfo.c
@@ -316,7 +316,7 @@ PHP_FUNCTION(finfo_open)
                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;
                }

diff --git a/ext/fileinfo/tests/finfo_open_001.phpt b/ext/fileinfo/tests/finfo_open_001.phpt
new file mode 100644 (file)
index 0000000..550eb0d
--- /dev/null
+++ b/ext/fileinfo/tests/finfo_open_001.phpt
@@ -0,0 +1,25 @@
+--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)