iliaa Wed Sep 17 23:27:54 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/xmlwriter php_xmlwriter.c
/php-src NEWS
Log:
Fixed bug #46110 (XMLWriter - openmemory() and openuri() leak memory on
multiple calls).
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlwriter/php_xmlwriter.c?r1=1.20.2.12.2.15.2.5&r2=1.20.2.12.2.15.2.6&diff_format=u
Index: php-src/ext/xmlwriter/php_xmlwriter.c
diff -u php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.15.2.5
php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.15.2.6
--- php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.15.2.5 Fri Jun 27
13:13:09 2008
+++ php-src/ext/xmlwriter/php_xmlwriter.c Wed Sep 17 23:27:53 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_xmlwriter.c,v 1.20.2.12.2.15.2.5 2008/06/27 13:13:09 felipe Exp $
*/
+/* $Id: php_xmlwriter.c,v 1.20.2.12.2.15.2.6 2008/09/17 23:27:53 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1844,6 +1844,9 @@
intern->uri_output = out_buffer;
#else
if (this) {
+ if (ze_obj->xmlwriter_ptr) {
+ xmlwriter_free_resource_ptr(ze_obj->xmlwriter_ptr
TSRMLS_CC);
+ }
ze_obj->xmlwriter_ptr = intern;
RETURN_TRUE;
} else
@@ -1894,6 +1897,9 @@
intern->uri_output = NULL;
#else
if (this) {
+ if (ze_obj->xmlwriter_ptr) {
+ xmlwriter_free_resource_ptr(ze_obj->xmlwriter_ptr
TSRMLS_CC);
+ }
ze_obj->xmlwriter_ptr = intern;
RETURN_TRUE;
} else
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.322&r2=1.2027.2.547.2.965.2.323&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.322
php-src/NEWS:1.2027.2.547.2.965.2.323
--- php-src/NEWS:1.2027.2.547.2.965.2.322 Wed Sep 17 15:11:27 2008
+++ php-src/NEWS Wed Sep 17 23:27:53 2008
@@ -53,6 +53,8 @@
- Fixed a bug causing miscalculations with the "last <weekday> of <n> month"
relative time string. (Derick)
+- Fixed bug #46110 (XMLWriter - openmemory() and openuri() leak memory on
+ multiple calls). (Ilia)
- Fixed bug #46032 (PharData::__construct() wrong memory read). (Greg)
- Fixed bug #45826 (custom ArrayObject serialization). (Etienne)
- Fixed bug #45798 (sqlite3 doesn't notice if variable was bound). (Felipe)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
