diff options
| author | Anatol Belski <ab@php.net> | 2016-09-03 00:05:02 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-09-03 00:05:02 +0200 |
| commit | 7483acf511a1932adec1fd29bebee5056283311c (patch) | |
| tree | 513db1546593a3261eb35377aed7e92b97045050 | |
| parent | e14b14d026fd588117d8c976cb2dfdeafb45c8dd (diff) | |
| parent | 5efd2a33df62d2bcaeeb6c8ff6ef20478f3a5417 (diff) | |
| download | php-git-7483acf511a1932adec1fd29bebee5056283311c.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix double free
| -rw-r--r-- | ext/phar/zip.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ext/phar/zip.c b/ext/phar/zip.c index 764f2b133d..73a11870aa 100644 --- a/ext/phar/zip.c +++ b/ext/phar/zip.c @@ -1171,7 +1171,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 */ |