Fixed bug #36205 (Memory leaks on duplicate cookies)

dstogov · dstogov · commit 66c19b66e4b6 · 2006-02-13T12:18:48.000Z
diff --git 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
@@ -204,6 +204,7 @@ PHPAPI void php_register_variable_ex(char *var, zval *val, pval *track_vars_arra
 				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);

Original file line number	Diff line number	Diff line change
`@@ -204,6 +204,7 @@ PHPAPI void php_register_variable_ex(char var, zval val, pval *track_vars_arra`
`204`	`204`	`if (PG(http_globals)[TRACK_VARS_COOKIE] && symtable1 == Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_COOKIE]) &&`
`205`	`205`	`zend_symtable_find(symtable1, escaped_index, index_len+1, (void **) &tmp) != FAILURE) {`
`206`	`206`	`efree(escaped_index);`
	`207`	`+ zval_ptr_dtor(&gpc_element);`
`207`	`208`	`break;`
`208`	`209`	`}`
`209`	`210`	`zend_symtable_update(symtable1, escaped_index, index_len+1, &gpc_element, sizeof(zval ), (void *) &gpc_element_p);`