From 6768378f719a8fbcfb465c977d6992f228377188 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 28 Dec 2015 09:19:28 +0100 Subject: [PATCH] Properly handle errors in upacking zip archive MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When zip_open fails, we do not have proper handle to use for zip_close. Fixes #11784 Signed-off-by: Michal Čihař --- ChangeLog | 1 + libraries/zip_extension.lib.php | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bbf452affb..daabd3aec3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ phpMyAdmin - ChangeLog - issue Table list not saved in db QBE bookmarked search - issue #11777 While 'changing a column', query fails with a syntax error after the 'CHARSET=' keyword - issue #11783 Avoid syntax error in javascript messages on invalid PHP setting for max_input_vars +- issue #11784 Properly handle errors in upacking zip archive 4.5.3.1 (2015-12-25) - issue #11774 Undefined offset 2 diff --git a/libraries/zip_extension.lib.php b/libraries/zip_extension.lib.php index b27158cc8a..c14a8a05f1 100644 --- a/libraries/zip_extension.lib.php +++ b/libraries/zip_extension.lib.php @@ -26,7 +26,6 @@ function PMA_getZipContents($file, $specific_entry = null) if (!is_resource($zip_handle)) { $error_message = __('Error in ZIP archive:') . ' ' . PMA_getZipError($zip_handle); - zip_close($zip_handle); return (array('error' => $error_message, 'data' => $file_data)); }