MFH: fix bug #46029 (Segfault in DOMText when using with Reflection)

diff --git a/ext/dom/cdatasection.c b/ext/dom/cdatasection.c
index 24c6f21b02ec31dafb56f1b130b398f20cb26b7a..2945b66ca95991dd00c560729972816b46555a2e 100644 (file)
--- 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 4cc72557bc314541a72324e75b312161017298eb..edf5838cd70d4c776fde6c9b04906acab846d68d 100644 (file)
--- 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 fb509ad420bc9ab090888392f2c7275ebe1a2997..f6030fd47ef6218c20ad2d61b0ca645ad2842a4b 100644 (file)
--- 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 bcb860ee19d42c61631ff3bb6ba47f0f22155aa3..e9caec6ccc5c5642843dba2a2cde53965008dc6d 100644 (file)
--- 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 e75183d80b2bfeef2cc9e28836d073ce359c6471..26479f31869d405d4cb7c0ec9e2447b39124858c 100644 (file)
--- 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);
                }