com php-src: Fix #70752: Depacking with wrong password leaves 0 length files: NEWS ext/zip/php_zip.c ext/zip/tests/bug707 52.phpt
ext/zip/tests/bug70752.zip
| From: | Christoph Michael Becker | Date: | Mon, 05 Sep 2016 23:03:46 +0000 |
| Subject: | com php-src: Fix #70752: Depacking with wrong password leaves 0 length files: NEWS ext/zip/php_zip.c ext/zip/tests/bug707 52.phpt ext/zip/tests/bug70752.zip |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-94332@lists.php.net to get a copy of this message | ||
Commit: 8aad3131a1d00e191db1b3b27aed6e7fae269f13
Author: Christoph M. Becker <cmbecker69@gmx.de> Tue, 6 Sep 2016 00:28:28 +0200
Parents: dd6da58fac6532d72c9e699a45db2b52d68d4c50
Branches: PHP-5.6 PHP-7.0 PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8aad3131a1d00e191db1b3b27aed6e7fae269f13
Log:
Fix #70752: Depacking with wrong password leaves 0 length files
We should not open the output stream before we have tried to open the
archive entry, as failing the latter could leave an empty file behind.
Bugs:
https://bugs.php.net/70752
Changed paths:
M NEWS
M ext/zip/php_zip.c
A ext/zip/tests/bug70752.phpt
A ext/zip/tests/bug70752.zip
Diff:
diff --git a/NEWS b/NEWS
index b1dfcaa..bd67749 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,10 @@ PHP NEWS
. Fixed bug #72590 (Opcache restart with kill_all_lockers does not work).
(Keyur) (julien backport)
+- Zip:
+ . Fixed bug #70752 (Depacking with wrong password leaves 0 length files).
+ (cmb)
+
15 Sep 2016, PHP 5.6.26
- Core:
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
index 47477ac..eeca8ab 100644
--- a/ext/zip/php_zip.c
+++ b/ext/zip/php_zip.c
@@ -279,6 +279,12 @@ static int php_zip_extract_file(struct zip * za, char *dest, char *file, int
fil
return 0;
}
+ zf = zip_fopen(za, file, 0);
+ if (zf == NULL) {
+ n = -1;
+ goto done;
+ }
+
#if PHP_API_VERSION < 20100412
stream = php_stream_open_wrapper(fullpath, "w+b", REPORT_ERRORS|ENFORCE_SAFE_MODE,
NULL);
#else
@@ -287,13 +293,7 @@ static int php_zip_extract_file(struct zip * za, char *dest, char *file, int
fil
if (stream == NULL) {
n = -1;
- goto done;
- }
-
- zf = zip_fopen(za, file, 0);
- if (zf == NULL) {
- n = -1;
- php_stream_close(stream);
+ zip_fclose(zf);
goto done;
}
diff --git a/ext/zip/tests/bug70752.phpt b/ext/zip/tests/bug70752.phpt
new file mode 100644
index 0000000..f006fbe
--- /dev/null
+++ b/ext/zip/tests/bug70752.phpt
@@ -0,0 +1,31 @@
+--TEST--
+Bug #70752 (Depacking with wrong password leaves 0 length files)
+--SKIPIF--
+<?php
+if (!extension_loaded('zip')) die('skip zip extension not available');
+?>
+--FILE--
+<?php
+$filename = __DIR__ . DIRECTORY_SEPARATOR .. 'bug70752.zip';
+$zip = new ZipArchive();
+$zip->open($filename);
+
+$filename = __DIR__ . DIRECTORY_SEPARATOR . 'bug70752.txt';
+var_dump(file_exists($filename));
+
+$zip->setPassword('bar'); // correct password would be 'foo'
+$zip->extractTo(__DIR__);
+$zip->close();
+
+var_dump(file_exists($filename));
+?>
+===DONE===
+--EXPECT--
+bool(false)
+bool(false)
+===DONE===
+--CLEAN--
+<?php
+$filename = __DIR__ . DIRECTORY_SEPARATOR . 'bug70752.txt';
+unlink($filename);
+?>
diff --git a/ext/zip/tests/bug70752.zip b/ext/zip/tests/bug70752.zip
new file mode 100644
index 0000000..9bec61b
Binary files /dev/null and b/ext/zip/tests/bug70752.zip differ