From: Rob Richards Date: Wed, 10 Sep 2008 15:40:34 +0000 (+0000) Subject: MFH: fix bug #46029 (Segfault in DOMText when using with Reflection) X-Git-Tag: php-5.2.7RC1~55 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=77494520a46c73a9372f092b938d708a908f7ccb;p=php MFH: fix bug #46029 (Segfault in DOMText when using with Reflection) --- diff --git a/ext/dom/cdatasection.c b/ext/dom/cdatasection.c index 24c6f21b02..2945b66ca9 100644 --- a/ext/dom/cdatasection.c +++ b/ext/dom/cdatasection.c @@ -73,7 +73,7 @@ PHP_METHOD(domcdatasection, __construct) intern = (dom_object *)zend_object_store_get_object(id TSRMLS_CC); if (intern != NULL) { - oldnode = (xmlNodePtr)intern->ptr; + oldnode = dom_object_get_node(intern); if (oldnode != NULL) { php_libxml_node_free_resource(oldnode TSRMLS_CC); } diff --git a/ext/dom/comment.c b/ext/dom/comment.c index 4cc72557bc..edf5838cd7 100644 --- a/ext/dom/comment.c +++ b/ext/dom/comment.c @@ -73,7 +73,7 @@ PHP_METHOD(domcomment, __construct) intern = (dom_object *)zend_object_store_get_object(id TSRMLS_CC); if (intern != NULL) { - oldnode = (xmlNodePtr)intern->ptr; + oldnode = dom_object_get_node(intern); if (oldnode != NULL) { php_libxml_node_free_resource(oldnode TSRMLS_CC); } diff --git a/ext/dom/documentfragment.c b/ext/dom/documentfragment.c index fb509ad420..f6030fd47e 100644 --- a/ext/dom/documentfragment.c +++ b/ext/dom/documentfragment.c @@ -76,7 +76,7 @@ PHP_METHOD(domdocumentfragment, __construct) intern = (dom_object *)zend_object_store_get_object(id TSRMLS_CC); if (intern != NULL) { - oldnode = (xmlNodePtr)intern->ptr; + oldnode = dom_object_get_node(intern); if (oldnode != NULL) { php_libxml_node_free_resource(oldnode TSRMLS_CC); } diff --git a/ext/dom/processinginstruction.c b/ext/dom/processinginstruction.c index bcb860ee19..e9caec6ccc 100644 --- a/ext/dom/processinginstruction.c +++ b/ext/dom/processinginstruction.c @@ -81,7 +81,7 @@ PHP_METHOD(domprocessinginstruction, __construct) intern = (dom_object *)zend_object_store_get_object(id TSRMLS_CC); if (intern != NULL) { - oldnode = (xmlNodePtr)intern->ptr; + oldnode = dom_object_get_node(intern); if (oldnode != NULL) { php_libxml_node_free_resource(oldnode TSRMLS_CC); } diff --git a/ext/dom/text.c b/ext/dom/text.c index e75183d80b..26479f3186 100644 --- a/ext/dom/text.c +++ b/ext/dom/text.c @@ -91,7 +91,7 @@ PHP_METHOD(domtext, __construct) intern = (dom_object *)zend_object_store_get_object(id TSRMLS_CC); if (intern != NULL) { - oldnode = (xmlNodePtr)intern->ptr; + oldnode = dom_object_get_node(intern); if (oldnode != NULL) { php_libxml_node_free_resource(oldnode TSRMLS_CC); }