com php-src: Merge branch 'PHP-5.6': ext/phar/phar.c
| From: | Dmitry Stogov | Date: | Tue, 14 Apr 2015 12:49:44 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/phar/phar.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86221@lists.php.net to get a copy of this message | ||
Commit: 6762fcfa9099ab401934c725b2752170d4274255
Author: Dmitry Stogov <dmitry@zend.com> Tue, 14 Apr 2015 15:49:44 +0300
Parents: 753fa0c593aa9be8ca749b2dc8b8999f587f5784 e1821090efe8eeabed392ae6bbbcddbc24b2a2b3
Branches: master
Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=6762fcfa9099ab401934c725b2752170d4274255
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed recently introduced memory leak
Changed paths:
MM ext/phar/phar.c
Diff:
diff --cc ext/phar/phar.c
index c4b6150,2f2c4d3..a28a5ea
--- a/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@@ -1113,9 -1111,10 +1113,10 @@@ static int phar_parse_pharfile(php_stre
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) {
+ if (phar_parse_metadata(&buffer, &entry.metadata, len) == FAILURE) {
pefree(entry.filename, entry.is_persistent);
MAPPHAR_FAIL("unable to read file metadata in .phar file \"%s\"");
}