sfox Sat Jun 21 20:14:43 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar zip.c
Log:
- pefree pemalloc'd filename
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/zip.c?r1=1.47.2.12&r2=1.47.2.13&diff_format=u
Index: php-src/ext/phar/zip.c
diff -u php-src/ext/phar/zip.c:1.47.2.12 php-src/ext/phar/zip.c:1.47.2.13
--- php-src/ext/phar/zip.c:1.47.2.12 Sat Jun 21 19:40:41 2008
+++ php-src/ext/phar/zip.c Sat Jun 21 20:14:43 2008
@@ -333,7 +333,7 @@
if (PHAR_GET_16(zipentry.extra_len)) {
off_t loc = php_stream_tell(fp);
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");
}
php_stream_seek(fp, loc +
PHAR_GET_16(zipentry.extra_len), SEEK_SET);
@@ -345,14 +345,14 @@
case PHAR_ZIP_COMP_DEFLATE :
entry.flags |= PHAR_ENT_COMPRESSED_GZ;
if (!PHAR_G(has_zlib)) {
- efree(entry.filename);
+ pefree(entry.filename,
entry.is_persistent);
PHAR_ZIP_FAIL("zlib extension is
required");
}
break;
case PHAR_ZIP_COMP_BZIP2 :
entry.flags |= PHAR_ENT_COMPRESSED_BZ2;
if (!PHAR_G(has_bz2)) {
- efree(entry.filename);
+ pefree(entry.filename,
entry.is_persistent);
PHAR_ZIP_FAIL("bzip2 extension is
required");
}
break;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
