diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-04-14 15:48:20 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-04-14 15:48:20 +0300 |
| commit | e1821090efe8eeabed392ae6bbbcddbc24b2a2b3 (patch) | |
| tree | 91f30caf5cfdfe7fbbf8ca0ad6f9937aa0129e94 | |
| parent | 5fc635548e30fe16b0f112e26db3a4a2dc69522c (diff) | |
| parent | dfffa0ba5b7a42ffa77355c59c4054f5eaa3f1c5 (diff) | |
| download | php-git-e1821090efe8eeabed392ae6bbbcddbc24b2a2b3.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed recently introduced memory leak
| -rw-r--r-- | ext/phar/phar.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/phar/phar.c b/ext/phar/phar.c index 35dd8393f6..2f2c4d35f6 100644 --- a/ext/phar/phar.c +++ b/ext/phar/phar.c @@ -1111,6 +1111,7 @@ static int phar_parse_pharfile(php_stream *fp, char *fname, int fname_len, char entry.metadata_len = 0; } if (len > endbuffer - buffer) { + pefree(entry.filename, entry.is_persistent); MAPPHAR_FAIL("internal corruption of phar \"%s\" (truncated manifest entry)"); } if (phar_parse_metadata(&buffer, &entry.metadata, len TSRMLS_CC) == FAILURE) { |