summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2016-09-03 00:06:36 +0200
committerAnatol Belski <ab@php.net>2016-09-03 00:06:36 +0200
commit54ef995ed670ee1cc3b577c65ba977697949b195 (patch)
treed917525d676751e042ead3be6a0bf8f07bdb985c
parent5a0b45ab105a0132fe803bae8708b1b4358a67c5 (diff)
parente89c09ba293669b92949f9bd6f5b79d6b2a2a30d (diff)
downloadphp-git-54ef995ed670ee1cc3b577c65ba977697949b195.tar.gz
Merge branch 'PHP-7.1'
* PHP-7.1: fix double free
-rw-r--r--ext/phar/zip.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/ext/phar/zip.c b/ext/phar/zip.c
index 427b894288..18e47aaa16 100644
--- a/ext/phar/zip.c
+++ b/ext/phar/zip.c
@@ -1170,7 +1170,6 @@ static int phar_zip_applysignature(phar_archive_data *phar, struct _phar_zip_pas
if (pass->error && *(pass->error)) {
/* error is set by writeheaders */
- php_stream_close(newfile);
return FAILURE;
}
} /* signature */