]> granicus.if.org Git - php/commitdiff
- pefree pemalloc'd filename
authorSteph Fox <sfox@php.net>
Sat, 21 Jun 2008 20:14:43 +0000 (20:14 +0000)
committerSteph Fox <sfox@php.net>
Sat, 21 Jun 2008 20:14:43 +0000 (20:14 +0000)
ext/phar/zip.c

index 54a6c75583d2787a5f797f66fa03319f8d6f53b7..4ee7073b06c5d4edd1ccb74f53fdf9fafd7a4467 100644 (file)
@@ -333,7 +333,7 @@ foundit:
                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 @@ foundit:
                        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;