archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 08:49:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

- pefree pemalloc'd filename

Browse source
This commit is contained in:
Steph Fox 2008-06-21 20:14:43 +00:00
parent 22fb73c71e
commit ad20b9e6bb
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ext/phar/zip.c
View file

@ -333,7 +333,7 @@ foundit:
if (PHAR_GET_16(zipentry.extra_len)) { if (PHAR_GET_16(zipentry.extra_len)) {
off_t loc = php_stream_tell(fp); off_t loc = php_stream_tell(fp);
if (FAILURE == phar_zip_process_extra(fp, &entry, PHAR_GET_16(zipentry.extra_len) TSRMLS_CC)) { if (FAILURE == phar_zip_process_extra(fp, &entry, PHAR_GET_16(zipentry.extra_len) TSRMLS_CC)) {
efree(entry.filename); pefree(entry.filename, entry.is_persistent);
PHAR_ZIP_FAIL("Unable to process extra field header for file in central directory"); PHAR_ZIP_FAIL("Unable to process extra field header for file in central directory");
} }
php_stream_seek(fp, loc + PHAR_GET_16(zipentry.extra_len), SEEK_SET); php_stream_seek(fp, loc + PHAR_GET_16(zipentry.extra_len), SEEK_SET);
@ -345,14 +345,14 @@ foundit:
case PHAR_ZIP_COMP_DEFLATE : case PHAR_ZIP_COMP_DEFLATE :
entry.flags |= PHAR_ENT_COMPRESSED_GZ; entry.flags |= PHAR_ENT_COMPRESSED_GZ;
if (!PHAR_G(has_zlib)) { if (!PHAR_G(has_zlib)) {
efree(entry.filename); pefree(entry.filename, entry.is_persistent);
PHAR_ZIP_FAIL("zlib extension is required"); PHAR_ZIP_FAIL("zlib extension is required");
} }
break; break;
case PHAR_ZIP_COMP_BZIP2 : case PHAR_ZIP_COMP_BZIP2 :
entry.flags |= PHAR_ENT_COMPRESSED_BZ2; entry.flags |= PHAR_ENT_COMPRESSED_BZ2;
if (!PHAR_G(has_bz2)) { if (!PHAR_G(has_bz2)) {
efree(entry.filename); pefree(entry.filename, entry.is_persistent);
PHAR_ZIP_FAIL("bzip2 extension is required"); PHAR_ZIP_FAIL("bzip2 extension is required");
} }
break; break;