cellog Fri Sep 26 16:30:10 2008 UTC Modified files: /php-src/ext/phar phar.c /php-src/ext/phar/tests bug46178.phpt Log: MFB: fix bug #46178: memory leak in ext/phar http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.c?r1=1.384&r2=1.385&diff_format=u Index: php-src/ext/phar/phar.c diff -u php-src/ext/phar/phar.c:1.384 php-src/ext/phar/phar.c:1.385 --- php-src/ext/phar/phar.c:1.384 Sat Sep 13 22:31:18 2008 +++ php-src/ext/phar/phar.c Fri Sep 26 16:30:10 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: phar.c,v 1.384 2008/09/13 22:31:18 cellog Exp $ */ +/* $Id: phar.c,v 1.385 2008/09/26 16:30:10 cellog Exp $ */ #define PHAR_MAIN 1 #include "phar_internal.h" @@ -440,6 +440,11 @@ if (idata->fp && idata->fp != idata->phar->fp && idata->fp != idata->phar->ufp && idata->fp != idata->internal_file->fp) { php_stream_close(idata->fp); } + /* if phar_get_or_create_entry_data returns a sub-directory, we have to free it */ + if (idata->internal_file->is_temp_dir) { + destroy_phar_manifest_entry((void *)idata->internal_file); + efree(idata->internal_file); + } } phar_archive_delref(idata->phar TSRMLS_CC); @@ -3613,7 +3618,7 @@ php_info_print_table_header(2, "Phar: PHP Archive support", "enabled"); php_info_print_table_row(2, "Phar EXT version", PHP_PHAR_VERSION); php_info_print_table_row(2, "Phar API version", PHP_PHAR_API_VERSION); - php_info_print_table_row(2, "CVS revision", "$Revision: 1.384 $"); + php_info_print_table_row(2, "CVS revision", "$Revision: 1.385 $"); php_info_print_table_row(2, "Phar-based phar archives", "enabled"); php_info_print_table_row(2, "Tar-based phar archives", "enabled"); php_info_print_table_row(2, "ZIP-based phar archives", "enabled"); http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/bug46178.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/phar/tests/bug46178.phpt diff -u /dev/null php-src/ext/phar/tests/bug46178.phpt:1.2 --- /dev/null Fri Sep 26 16:30:10 2008 +++ php-src/ext/phar/tests/bug46178.phpt Fri Sep 26 16:30:10 2008 @@ -0,0 +1,20 @@ +--TEST-- +Phar: PHP bug #46178: "memory leak in ext/phar" +--SKIPIF-- +<?php if (!extension_loaded("phar")) die("skip"); ?> +--INI-- +phar.require_hash=0 +phar.readonly=0 +--FILE-- +<?php +$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar'; + +$phar = new Phar($fname); +$phar['long/path/name.txt'] = 'hi'; +$phar->addEmptyDir('long/path'); +?> +===DONE=== +--CLEAN-- +<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar');?> +--EXPECT-- +===DONE=== \ No newline at end of file
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php