rrichards Wed Sep 10 15:39:44 2008 UTC
Modified files:
/php-src/ext/dom cdatasection.c comment.c documentfragment.c
processinginstruction.c text.c
Log:
fix bug #46029 (Segfault in DOMText when using with Reflection)
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/cdatasection.c?r1=1.22&r2=1.23&diff_format=u
Index: php-src/ext/dom/cdatasection.c
diff -u php-src/ext/dom/cdatasection.c:1.22 php-src/ext/dom/cdatasection.c:1.23
--- php-src/ext/dom/cdatasection.c:1.22 Thu Aug 14 08:38:36 2008
+++ php-src/ext/dom/cdatasection.c Wed Sep 10 15:39:43 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: cdatasection.c,v 1.22 2008/08/14 08:38:36 tony2001 Exp $ */
+/* $Id: cdatasection.c,v 1.23 2008/09/10 15:39:43 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -72,7 +72,7 @@
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);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/comment.c?r1=1.22&r2=1.23&diff_format=u
Index: php-src/ext/dom/comment.c
diff -u php-src/ext/dom/comment.c:1.22 php-src/ext/dom/comment.c:1.23
--- php-src/ext/dom/comment.c:1.22 Thu Aug 14 08:38:37 2008
+++ php-src/ext/dom/comment.c Wed Sep 10 15:39:43 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: comment.c,v 1.22 2008/08/14 08:38:37 tony2001 Exp $ */
+/* $Id: comment.c,v 1.23 2008/09/10 15:39:43 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -72,7 +72,7 @@
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);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/documentfragment.c?r1=1.26&r2=1.27&diff_format=u
Index: php-src/ext/dom/documentfragment.c
diff -u php-src/ext/dom/documentfragment.c:1.26
php-src/ext/dom/documentfragment.c:1.27
--- php-src/ext/dom/documentfragment.c:1.26 Thu Aug 14 08:38:37 2008
+++ php-src/ext/dom/documentfragment.c Wed Sep 10 15:39:43 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: documentfragment.c,v 1.26 2008/08/14 08:38:37 tony2001 Exp $ */
+/* $Id: documentfragment.c,v 1.27 2008/09/10 15:39:43 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -75,7 +75,7 @@
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);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/processinginstruction.c?r1=1.29&r2=1.30&diff_format=u
Index: php-src/ext/dom/processinginstruction.c
diff -u php-src/ext/dom/processinginstruction.c:1.29
php-src/ext/dom/processinginstruction.c:1.30
--- php-src/ext/dom/processinginstruction.c:1.29 Thu Aug 14 08:38:37 2008
+++ php-src/ext/dom/processinginstruction.c Wed Sep 10 15:39:43 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: processinginstruction.c,v 1.29 2008/08/14 08:38:37 tony2001 Exp $ */
+/* $Id: processinginstruction.c,v 1.30 2008/09/10 15:39:43 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -79,7 +79,7 @@
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);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/text.c?r1=1.38&r2=1.39&diff_format=u
Index: php-src/ext/dom/text.c
diff -u php-src/ext/dom/text.c:1.38 php-src/ext/dom/text.c:1.39
--- php-src/ext/dom/text.c:1.38 Thu Aug 14 08:38:37 2008
+++ php-src/ext/dom/text.c Wed Sep 10 15:39:43 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: text.c,v 1.38 2008/08/14 08:38:37 tony2001 Exp $ */
+/* $Id: text.c,v 1.39 2008/09/10 15:39:43 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -91,7 +91,7 @@
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);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
