dmitry Mon Feb 13 12:19:10 2006 UTC
Modified files: (Branch: PHP_4_4)
/php-src NEWS
/php-src/main php_variables.c
Log:
Fixed bug #36205 (Memory leaks on duplicate cookies)
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.1247.2.920.2.115&r2=1.1247.2.920.2.116&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.115 php-src/NEWS:1.1247.2.920.2.116
--- php-src/NEWS:1.1247.2.920.2.115 Wed Feb 1 10:32:38 2006
+++ php-src/NEWS Mon Feb 13 12:19:09 2006
@@ -4,6 +4,7 @@
- Added a check for special characters in the session name. (Ilia)
- Fixed bug #36242 (Possible memory corruption in stream_select()). (Tony)
- Fixed bug #36223 (curl bypasses open_basedir restrictions). (Tony)
+- Fixed bug #36205 (Memory leaks on duplicate cookies). (Dmitry)
- Fixed bug #36148 (unpack("H*hex", $data) is adding an extra character to the
end of the string). (Ilia)
- Fixed bug #36017 (fopen() crashes PHP when opening a URL). (Tony)
http://cvs.php.net/viewcvs.cgi/php-src/main/php_variables.c?r1=1.45.2.13.2.5&r2=1.45.2.13.2.6&diff_format=u
Index: php-src/main/php_variables.c
diff -u php-src/main/php_variables.c:1.45.2.13.2.5
php-src/main/php_variables.c:1.45.2.13.2.6
--- php-src/main/php_variables.c:1.45.2.13.2.5 Sun Jan 1 13:47:00 2006
+++ php-src/main/php_variables.c Mon Feb 13 12:19:10 2006
@@ -16,7 +16,7 @@
| Zeev Suraski <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_variables.c,v 1.45.2.13.2.5 2006/01/01 13:47:00 sniper Exp $ */
+/* $Id: php_variables.c,v 1.45.2.13.2.6 2006/02/13 12:19:10 dmitry Exp $ */
#include <stdio.h>
#include "php.h"
@@ -201,6 +201,7 @@
if (PG(http_globals)[TRACK_VARS_COOKIE]
&& symtable1 == Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_COOKIE]) &&
zend_hash_find(symtable1, escaped_index, index_len+1, (void **) &tmp) !=
FAILURE) {
efree(escaped_index);
+ zval_ptr_dtor(&gpc_element);
break;
}
@@ -209,6 +210,7 @@
} else {
if (PG(http_globals)[TRACK_VARS_COOKIE]
&& symtable1 == Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_COOKIE]) &&
zend_hash_find(symtable1, index, index_len+1, (void **) &tmp) != FAILURE) {
+ zval_ptr_dtor(&gpc_element);
break;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
