summaryrefslogtreecommitdiff
path: root/ext/phar
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2016-09-03 00:06:16 +0200
committerAnatol Belski <ab@php.net>2016-09-03 00:06:16 +0200
commite89c09ba293669b92949f9bd6f5b79d6b2a2a30d (patch)
treeaffe568f3931c92014ca81520ce9f7c8bafe9f08 /ext/phar
parente4564e4b985cc9cf4e53eca3152b869843247cf2 (diff)
parent7483acf511a1932adec1fd29bebee5056283311c (diff)
downloadphp-git-e89c09ba293669b92949f9bd6f5b79d6b2a2a30d.tar.gz
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0: fix double free
Diffstat (limited to 'ext/phar')
-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 */