From: Felipe Pena <felipe@php.net>
Date: Wed, 27 Aug 2008 01:02:58 +0000 (+0000)
Subject: - Fixed check for empty file name
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~557
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ea5d69120dd4bd36adb7d2fd3d28ba17ef31c29a;p=php

- Fixed check for empty file name
---

diff --git a/ext/fileinfo/fileinfo.c b/ext/fileinfo/fileinfo.c
index 475169166a..c0cc47e84a 100644
--- 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
index 0000000000..550eb0d4ec
--- /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)