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

diff --git a/ext/dom/cdatasection.c b/ext/dom/cdatasection.c
index 8ed7e17e6745b4c81d19f5b079709e403efb17b8..6d0112472bc49d709f901fec8d22afd230790af7 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 55b5ed93f6bcbcc5545bbe3450b03213e10eb4e4..2f9a027ea18f7eb591a1ae7664ed7403aa1f36c0 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 8be9ed1fcfb06b0621719f5cdc299ffb57b167e7..e8b197a6c9b5df6fec767bd16b91917b83b135be 100644 (file)
--- a/ext/dom/documentfragment.c
+++ b/ext/dom/documentfragment.c
@@ -75,7 +75,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 153bac94d4ba4d158850c745f049a80d06861ee8..e37402a546ab362402a9ec0990d34b02c9f9fbea 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 4193f7146766a7f1571ad2422538b1cf4b6d1698..f5517f4b76e779dbe64e215fe141b77b98a08853 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);
                }