cvs: php-src / NEWS /main php_variables.c

iliaa Tue Aug 2 13:01:05 2005 EDT Modified files: /php-src NEWS /php-src/main php_variables.c Log: Fixed bug #33958 (duplicate cookies and magic_quotes=off may cause a crash) http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2017&r2=1.2018&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2017 php-src/NEWS:1.2018 --- php-src/NEWS:1.2017 Tue Aug 2 12:31:52 2005 +++ php-src/NEWS Tue Aug 2 13:01:04 2005 @@ -3,6 +3,8 @@ ?? ??? 2005, PHP 5.1 - Fixed bug #33967 (misuse of Exception constructor doesn't display errorfile). (Jani) +- Fixed bug #33958 (duplicate cookies and magic_quotes=off may cause a crash). + (Ilia) - Fixed bug #33917 (number_format() output with > 1 char separators). (Jani) - Fixed bug #33904 (input array keys being escaped when magic quotes is off). (Ilia) http://cvs.php.net/diff.php/php-src/main/php_variables.c?r1=1.102&r2=1.103&ty=u Index: php-src/main/php_variables.c diff -u php-src/main/php_variables.c:1.102 php-src/main/php_variables.c:1.103 --- php-src/main/php_variables.c:1.102 Fri Jul 29 11:43:37 2005 +++ php-src/main/php_variables.c Tue Aug 2 13:01:05 2005 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_variables.c,v 1.102 2005/07/29 15:43:37 iliaa Exp $ */ +/* $Id: php_variables.c,v 1.103 2005/08/02 17:01:05 iliaa Exp $ */ #include <stdio.h> #include "php.h" @@ -198,7 +198,9 @@ */ if (PG(http_globals)[TRACK_VARS_COOKIE] && symtable1 == Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_COOKIE]) && zend_symtable_find(symtable1, escaped_index, index_len+1, (void **) &tmp) != FAILURE) { - efree(escaped_index); + if (PG(magic_quotes_gpc)) { + efree(escaped_index); + } break; } zend_symtable_update(symtable1, escaped_index, index_len + 1, &gpc_element, sizeof(zval *), (void **) &gpc_element_p);