From 3ade387884e878b5dba7ed5038f491de243408c7 Mon Sep 17 00:00:00 2001 From: Felipe Pena Date: Tue, 26 Aug 2008 15:03:33 +0000 Subject: [PATCH] - Added check for empty file name --- ext/fileinfo/fileinfo.c | 7 ++++--- ext/fileinfo/tests/finfo_file_001.phpt | 17 +++++++++++++++++ 2 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 ext/fileinfo/tests/finfo_file_001.phpt diff --git a/ext/fileinfo/fileinfo.c b/ext/fileinfo/fileinfo.c index e291ac9d36..0824ef1a96 100644 --- a/ext/fileinfo/fileinfo.c +++ b/ext/fileinfo/fileinfo.c @@ -448,11 +448,12 @@ static void _php_finfo_get_type(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ * } } else { /* local file */ char resolved_path[MAXPATHLEN]; - if (!VCWD_REALPATH(buffer, resolved_path)) { + + if (buffer_len && VCWD_REALPATH(buffer, resolved_path)) { + ret_val = (char *) magic_file(finfo->magic, buffer); + } else { RETURN_FALSE; } - - ret_val = (char *) magic_file(finfo->magic, buffer); goto common; } } else { /* buffer */ diff --git a/ext/fileinfo/tests/finfo_file_001.phpt b/ext/fileinfo/tests/finfo_file_001.phpt new file mode 100644 index 0000000000..6ef8e27863 --- /dev/null +++ b/ext/fileinfo/tests/finfo_file_001.phpt @@ -0,0 +1,17 @@ +--TEST-- +finfo_file(): Testing file names +--FILE-- + +--EXPECT-- +bool(false) +bool(false) +string(9) "directory" +bool(false) -- 2.40.0