clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 19:07:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

increase code coverage in util.c

Browse Source
This commit is contained in:
Greg Beaver 2008-05-12 00:43:11 +00:00
parent e6558c56a3
commit 51a1d6a3b7
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/phar/tests/mkdir.phpt
View File

@ -17,6 +17,8 @@ mkdir($pname . '/a');
rmdir('phar://'); rmdir('phar://');
rmdir('phar://foo.phar'); rmdir('phar://foo.phar');
rmdir($pname . '/a'); rmdir($pname . '/a');
$a->addEmptyDir('bb');
$a->addEmptyDir('bb');
?> ?>
===DONE=== ===DONE===
--CLEAN-- --CLEAN--

6
ext/phar/util.c
View File

@ -212,7 +212,7 @@ char *phar_find_in_include_path(char *filename, int filename_len, phar_archive_d
{ {
#if PHP_VERSION_ID >= 50300 #if PHP_VERSION_ID >= 50300
char *path, *fname, *arch, *entry, *ret, *test; char *path, *fname, *arch, *entry, *ret, *test;
int arch_len, entry_len; int arch_len, entry_len, fname_len;
if (pphar) { if (pphar) {
*pphar = NULL; *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); return phar_save_resolve_path(filename, filename_len TSRMLS_CC);
} }
fname = zend_get_executed_filename(TSRMLS_C); 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); return phar_save_resolve_path(filename, filename_len TSRMLS_CC);
} }
efree(entry); efree(entry);