From 66c19b66e4b68fec2fdcd87b2691662877695956 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Mon, 13 Feb 2006 12:18:48 +0000 Subject: [PATCH] Fixed bug #36205 (Memory leaks on duplicate cookies) --- NEWS | 1 + main/php_variables.c | 1 + 2 files changed, 2 insertions(+) diff --git a/NEWS b/NEWS index 62816be1251..c647e613146 100644 --- a/NEWS +++ b/NEWS @@ -5,6 +5,7 @@ PHP NEWS array when row number > field_count). (Georg) - Renamed CachingRecursiveIterator to RecursiveCachingIterator. (Marcus) - Fixed bug #36303 (foreach on error_zval produces segfault). (Dmitry) +- Fixed bug #36205 (Memory leaks on duplicate cookies). (Dmitry) - Fixed bug #36071 (Engine Crash related with 'clone'). (Dmitry) - Fixed bug #36006 (Problem with $this in __destruct()). (Dmitry) - Fixed bug #35612 (iis6 Access Violation crash). (Dmitry, alacn.uhahaa) diff --git a/main/php_variables.c b/main/php_variables.c index 24671193577..f978a135942 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -204,6 +204,7 @@ plain_var: 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); + zval_ptr_dtor(&gpc_element); break; } zend_symtable_update(symtable1, escaped_index, index_len+1, &gpc_element, sizeof(zval *), (void **) &gpc_element_p);