summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@php.net>2006-02-13 12:18:48 +0000
committerDmitry Stogov <dmitry@php.net>2006-02-13 12:18:48 +0000
commit66c19b66e4b68fec2fdcd87b2691662877695956 (patch)
treefa3fa8883dfdb15b995261e48a2dca5ea9c12240
parent05703d7c1e7ff31b8e652efa64762aa63f66b80c (diff)
downloadphp-git-66c19b66e4b68fec2fdcd87b2691662877695956.tar.gz
Fixed bug #36205 (Memory leaks on duplicate cookies)
-rw-r--r--NEWS1
-rw-r--r--main/php_variables.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 62816be125..c647e61314 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 2467119357..f978a13594 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);