Merge branch 'PHP-7.0' into PHP-7.1

weltling · weltling · commit e89c09ba2936 · 2016-09-03T00:06:16.000+02:00
* PHP-7.0:
  fix double free
diff --git 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 */

Original file line number	Diff line number	Diff line change
`@@ -1170,7 +1170,6 @@ static int phar_zip_applysignature(phar_archive_data *phar, struct _phar_zip_pas`
`1170`	`1170`
`1171`	`1171`	`if (pass->error && *(pass->error)) {`
`1172`	`1172`	`/* error is set by writeheaders */`
`1173`		`- php_stream_close(newfile);`
`1174`	`1173`	`return FAILURE;`
`1175`	`1174`	`}`
`1176`	`1175`	`} /* signature */`