cvs: php-src /ext/dom php_dom.c
| From: | Ilia Alshanetsky | Date: | Tue, 16 Sep 2008 00:38:55 +0000 |
| Subject: | cvs: php-src /ext/dom php_dom.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-53171@lists.php.net to get a copy of this message | ||
iliaa Tue Sep 16 00:38:55 2008 UTC
Modified files:
/php-src/ext/dom php_dom.c
Log:
MFB: 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.110&r2=1.111&diff_format=u
Index: php-src/ext/dom/php_dom.c
diff -u php-src/ext/dom/php_dom.c:1.110 php-src/ext/dom/php_dom.c:1.111
--- php-src/ext/dom/php_dom.c:1.110 Thu Aug 14 08:38:37 2008
+++ php-src/ext/dom/php_dom.c Tue Sep 16 00:38:55 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_dom.c,v 1.110 2008/08/14 08:38:37 tony2001 Exp $ */
+/* $Id: php_dom.c,v 1.111 2008/09/16 00:38:55 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -954,8 +954,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);