Commit 2f16221

committed

Fix memory leak in phar tar temporary file error handling code

1 parent ebbed48 commit 2f16221Copy full SHA for 2f16221

File tree

-0

lines changed

-0

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ PHP NEWS`
`39`	`39`
`40`	`40`	`- Phar:`
`41`	`41`	`. Fixed memory leaks when verifying OpenSSL signature. (Girgias)`
	`42`	`+ . Fix memory leak in phar tar temporary file error handling code. (nielsdos)`
`42`	`43`
`43`	`44`	`- Standard:`
`44`	`45`	`. Fixed bug GH-16649 (UAF during array_splice). (alexandre-daubois)`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1211,6 +1211,7 @@ int phar_tar_flush(phar_archive_data phar, char user_stub, zend_long len, int`
`1211`	`1211`	`}`
`1212`	`1212`
`1213`	`1213`	`zend_hash_apply_with_argument(&phar->manifest, phar_tar_writeheaders, (void *) &pass);`
	`1214`	`+ /* TODO: memory leak and incorrect continuation if phar_tar_writeheaders fails? */`
`1214`	`1215`
`1215`	`1216`	`/* add signature for executable tars or tars explicitly set with setSignatureAlgorithm */`
`1216`	`1217`	`if (!phar->is_data \|\| phar->sig_flags) {`
`@@ -1234,6 +1235,12 @@ int phar_tar_flush(phar_archive_data phar, char user_stub, zend_long len, int`
`1234`	`1235`	`entry.fp = php_stream_fopen_tmpfile();`
`1235`	`1236`	`if (entry.fp == NULL) {`
`1236`	`1237`	`spprintf(error, 0, "phar error: unable to create temporary file");`
	`1238`	`+`
	`1239`	`+ efree(signature);`
	`1240`	`+ if (closeoldfile) {`
	`1241`	`+ php_stream_close(oldfile);`
	`1242`	`+ }`
	`1243`	`+ php_stream_close(newfile);`
`1237`	`1244`	`return EOF;`
`1238`	`1245`	`}`
`1239`	`1246`	`#ifdef WORDS_BIGENDIAN`

Comments

(0)