diff options
| author | Greg Beaver <cellog@php.net> | 2008-05-12 00:43:11 +0000 |
|---|---|---|
| committer | Greg Beaver <cellog@php.net> | 2008-05-12 00:43:11 +0000 |
| commit | 51a1d6a3b744e2d3408e03d3f7e4d9f14d4e054c (patch) | |
| tree | 352d0738f88af6bd809b8057b7c8602e28e0e0c9 /ext/phar/util.c | |
| parent | e6558c56a335e0e2daea179fcf2fc94e72e7accd (diff) | |
| download | php-git-51a1d6a3b744e2d3408e03d3f7e4d9f14d4e054c.tar.gz | |
increase code coverage in util.c
Diffstat (limited to 'ext/phar/util.c')
| -rw-r--r-- | ext/phar/util.c | 6 |
1 files changed, 4 insertions, 2 deletions
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); |