From: Greg Beaver <cellog@php.net>
Date: Mon, 12 May 2008 00:43:11 +0000 (+0000)
Subject: increase code coverage in util.c
X-Git-Tag: RELEASE_2_0_0b1~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=51a1d6a3b744e2d3408e03d3f7e4d9f14d4e054c;p=php

increase code coverage in util.c
---

diff --git a/ext/phar/tests/mkdir.phpt b/ext/phar/tests/mkdir.phpt
index 2adf1ccd28..af8bceb32c 100644
--- a/ext/phar/tests/mkdir.phpt
+++ b/ext/phar/tests/mkdir.phpt
@@ -17,6 +17,8 @@ mkdir($pname . '/a');
 rmdir('phar://');
 rmdir('phar://foo.phar');
 rmdir($pname . '/a');
+$a->addEmptyDir('bb');
+$a->addEmptyDir('bb');
 ?>
 ===DONE===
 --CLEAN--
diff --git a/ext/phar/util.c b/ext/phar/util.c
index 0add3b913e..5bdd018fdf 100644
--- a/ext/phar/util.c
+++ b/ext/phar/util.c
@@ -212,7 +212,7 @@ char *phar_find_in_include_path(char *filename, int filename_len, phar_archive_d
 {
 #if PHP_VERSION_ID >= 50300
 	char *path, *fname, *arch, *entry, *ret, *test;
-	int arch_len, entry_len;
+	int arch_len, entry_len, fname_len;
 
 	if (pphar) {
 		*pphar = NULL;
@@ -222,7 +222,9 @@ char *phar_find_in_include_path(char *filename, int filename_len, phar_archive_d
 		return phar_save_resolve_path(filename, filename_len TSRMLS_CC);
 	}
 	fname = zend_get_executed_filename(TSRMLS_C);
-	if (SUCCESS != phar_split_fname(fname, strlen(fname), &arch, &arch_len, &entry, &entry_len, 1, 0 TSRMLS_CC)) {
+	fname_len = strlen(fname);
+
+	if (fname_len < 7 || memcmp(fname, "phar://", 7) || SUCCESS != phar_split_fname(fname, strlen(fname), &arch, &arch_len, &entry, &entry_len, 1, 0 TSRMLS_CC)) {
 		return phar_save_resolve_path(filename, filename_len TSRMLS_CC);
 	}
 	efree(entry);