Fix #70103: ZipArchive::addGlob ignores remove_all_path option

When the remove_all_path option is set, but no add_path option, remove_all_path
is simply ignored. This patch fixes this.
This commit is contained in:
Christoph M. Becker 2015-07-20 17:22:08 +02:00 committed by Christoph M. Becker
parent f9744a36a2
commit c36ce04dd3
2 changed files with 36 additions and 2 deletions

View file

@ -1691,8 +1691,8 @@ static void php_zip_add_from_pattern(INTERNAL_FUNCTION_PARAMETERS, int type) /*
entry_name = entry_name_buf;
entry_name_len = strlen(entry_name);
} else {
entry_name = Z_STRVAL_P(zval_file);
entry_name_len = Z_STRLEN_P(zval_file);
entry_name = file_stripped;
entry_name_len = file_stripped_len;
}
if (basename) {
zend_string_release(basename);