cvs: php-src(PHP_5_3) / NEWS /ext/dom php_dom.c
| From: | Ilia Alshanetsky | Date: | Tue, 16 Sep 2008 00:38:45 +0000 |
| Subject: | cvs: php-src(PHP_5_3) / NEWS /ext/dom php_dom.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-53170@lists.php.net to get a copy of this message | ||
iliaa Tue Sep 16 00:38:45 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/dom php_dom.c
/php-src NEWS
Log:
Fixed bug #46087 (DOMXPath - segfault on destruction of a cloned object).
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/php_dom.c?r1=1.73.2.12.2.12.2.7&r2=1.73.2.12.2.12.2.8&diff_format=u
Index: php-src/ext/dom/php_dom.c
diff -u php-src/ext/dom/php_dom.c:1.73.2.12.2.12.2.7 php-src/ext/dom/php_dom.c:1.73.2.12.2.12.2.8
--- php-src/ext/dom/php_dom.c:1.73.2.12.2.12.2.7 Thu Aug 14 08:39:05 2008
+++ php-src/ext/dom/php_dom.c Tue Sep 16 00:38:44 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_dom.c,v 1.73.2.12.2.12.2.7 2008/08/14 08:39:05 tony2001 Exp $ */
+/* $Id: php_dom.c,v 1.73.2.12.2.12.2.8 2008/09/16 00:38:44 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -965,8 +965,10 @@
intern->ptr = NULL;
}
- zend_hash_destroy(intern->registered_phpfunctions);
- FREE_HASHTABLE(intern->registered_phpfunctions);
+ if (intern->registered_phpfunctions) {
+ zend_hash_destroy(intern->registered_phpfunctions);
+ FREE_HASHTABLE(intern->registered_phpfunctions);
+ }
if (intern->node_list) {
zend_hash_destroy(intern->node_list);
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.318&r2=1.2027.2.547.2.965.2.319&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.318 php-src/NEWS:1.2027.2.547.2.965.2.319
--- php-src/NEWS:1.2027.2.547.2.965.2.318 Mon Sep 15 22:13:25 2008
+++ php-src/NEWS Tue Sep 16 00:38:45 2008
@@ -6,6 +6,8 @@
- Changed error level E_ERROR into E_WARNING in Soap extension methods
parameter validation. (Felipe)
+- Fixed bug #46087 (DOMXPath - segfault on destruction of a cloned object).
+ (Ilia)
- Fixed bug #46086 (Segfault when accessing fileinfo class properties).
(Scott)
- Fixed bug #46072 (Compile failure under IRIX 6.5.30 building util.c) (Greg)