From c36ce04dd36c5d90363f843bc7fea1bb753cef93 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Mon, 20 Jul 2015 17:22:08 +0200 Subject: 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. --- ext/zip/php_zip.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ext/zip/php_zip.c') diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index 672097dec5..f32d515b83 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -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); -- cgit v1.2.1