From: Rob Richards <rrichards@php.net>
Date: Wed, 10 Sep 2008 15:40:11 +0000 (+0000)
Subject: MFH: fix bug #46029 (Segfault in DOMText when using with Reflection)
X-Git-Tag: BEFORE_NS_RULES_CHANGE~429
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e19c053adfcf22525ada61b25c35c6f24168ce19;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 8ed7e17e67..6d0112472b 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 55b5ed93f6..2f9a027ea1 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 8be9ed1fcf..e8b197a6c9 100644
--- 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 153bac94d4..e37402a546 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 4193f71467..f5517f4b76 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);
 		}