cvs: ZendEngine2(PHP_5_2) / zend_compile.c /tests bug40899.phpt php-src NEWS

dmitry Fri Mar 23 12:46:16 2007 UTC Added files: (Branch: PHP_5_2) /ZendEngine2/tests bug40899.phpt Modified files: /php-src NEWS /ZendEngine2 zend_compile.c Log: Fixed bug #40899 (memory leak when nesting list()) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.610&r2=1.2027.2.547.2.611&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.610 php-src/NEWS:1.2027.2.547.2.611 --- php-src/NEWS:1.2027.2.547.2.610 Fri Mar 23 07:59:26 2007 +++ php-src/NEWS Fri Mar 23 12:46:16 2007 @@ -35,6 +35,7 @@ - Fixed zend_llist_remove_tail (Michael Wallner, Dmitry) - Fixed a thread safety issue in gd gif read code (Nuno, Roman Nemecek) - Fixed CVE-2007-1001, GD wbmp used with invalid image size (Pierre) +- Fixed bug #40899 (memory leak when nesting list()). (Dmitry) - Fixed bug #40883 (mysql_query() is allocating memory incorrectly). (Tony) - Fixed bug #40872 (inconsistency in offsetSet, offsetExists treatment of string enclosed integers). (Marcus) http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_compile.c?r1=1.647.2.27.2.32&r2=1.647.2.27.2.33&diff_format=u Index: ZendEngine2/zend_compile.c diff -u ZendEngine2/zend_compile.c:1.647.2.27.2.32 ZendEngine2/zend_compile.c:1.647.2.27.2.33 --- ZendEngine2/zend_compile.c:1.647.2.27.2.32 Mon Mar 12 13:10:40 2007 +++ ZendEngine2/zend_compile.c Fri Mar 23 12:46:16 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_compile.c,v 1.647.2.27.2.32 2007/03/12 13:10:40 tony2001 Exp $ */ +/* $Id: zend_compile.c,v 1.647.2.27.2.33 2007/03/23 12:46:16 dmitry Exp $ */ #include <zend_language_parser.h> #include "zend.h" @@ -3423,6 +3423,7 @@ opline->opcode = ZEND_FETCH_DIM_TMP_VAR; break; } + opline->extended_value = ZEND_FETCH_ADD_LOCK; } else { opline->opcode = ZEND_FETCH_DIM_R; } @@ -3434,7 +3435,6 @@ Z_TYPE(opline->op2.u.constant) = IS_LONG; Z_LVAL(opline->op2.u.constant) = *((int *) dimension->data); INIT_PZVAL(&opline->op2.u.constant); - opline->extended_value = ZEND_FETCH_ADD_LOCK; last_container = opline->result; dimension = dimension->next; } http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/bug40899.phpt?view=markup&rev=1.1 Index: ZendEngine2/tests/bug40899.phpt +++ ZendEngine2/tests/bug40899.phpt