rrichards Wed Sep 10 15:40:11 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/dom cdatasection.c comment.c documentfragment.c
processinginstruction.c text.c
Log:
MFH: fix bug #46029 (Segfault in DOMText when using with Reflection)
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/cdatasection.c?r1=1.11.2.1.2.1.2.5&r2=1.11.2.1.2.1.2.6&diff_format=u
Index: php-src/ext/dom/cdatasection.c
diff -u php-src/ext/dom/cdatasection.c:1.11.2.1.2.1.2.5
php-src/ext/dom/cdatasection.c:1.11.2.1.2.1.2.6
--- php-src/ext/dom/cdatasection.c:1.11.2.1.2.1.2.5 Thu Aug 14 08:39:04 2008
+++ php-src/ext/dom/cdatasection.c Wed Sep 10 15:40:11 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: cdatasection.c,v 1.11.2.1.2.1.2.5 2008/08/14 08:39:04 tony2001 Exp $ */
+/* $Id: cdatasection.c,v 1.11.2.1.2.1.2.6 2008/09/10 15:40:11 rrichards Exp $
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -73,7 +73,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.11.2.1.2.1.2.5&r2=1.11.2.1.2.1.2.6&diff_format=u
Index: php-src/ext/dom/comment.c
diff -u php-src/ext/dom/comment.c:1.11.2.1.2.1.2.5
php-src/ext/dom/comment.c:1.11.2.1.2.1.2.6
--- php-src/ext/dom/comment.c:1.11.2.1.2.1.2.5 Thu Aug 14 08:39:04 2008
+++ php-src/ext/dom/comment.c Wed Sep 10 15:40:11 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: comment.c,v 1.11.2.1.2.1.2.5 2008/08/14 08:39:04 tony2001 Exp $ */
+/* $Id: comment.c,v 1.11.2.1.2.1.2.6 2008/09/10 15:40:11 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -73,7 +73,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.15.2.1.2.1.2.5&r2=1.15.2.1.2.1.2.6&diff_format=u
Index: php-src/ext/dom/documentfragment.c
diff -u php-src/ext/dom/documentfragment.c:1.15.2.1.2.1.2.5
php-src/ext/dom/documentfragment.c:1.15.2.1.2.1.2.6
--- php-src/ext/dom/documentfragment.c:1.15.2.1.2.1.2.5 Thu Aug 14 08:39:04 2008
+++ php-src/ext/dom/documentfragment.c Wed Sep 10 15:40:11 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: documentfragment.c,v 1.15.2.1.2.1.2.5 2008/08/14 08:39:04 tony2001 Exp
$ */
+/* $Id: documentfragment.c,v 1.15.2.1.2.1.2.6 2008/09/10 15:40:11 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.17.2.1.2.1.2.6&r2=1.17.2.1.2.1.2.7&diff_format=u
Index: php-src/ext/dom/processinginstruction.c
diff -u php-src/ext/dom/processinginstruction.c:1.17.2.1.2.1.2.6
php-src/ext/dom/processinginstruction.c:1.17.2.1.2.1.2.7
--- php-src/ext/dom/processinginstruction.c:1.17.2.1.2.1.2.6 Thu Aug 14
08:39:05 2008
+++ php-src/ext/dom/processinginstruction.c Wed Sep 10 15:40:11 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: processinginstruction.c,v 1.17.2.1.2.1.2.6 2008/08/14 08:39:05
tony2001 Exp $ */
+/* $Id: processinginstruction.c,v 1.17.2.1.2.1.2.7 2008/09/10 15:40:11
rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -81,7 +81,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.23.2.1.2.4.2.5&r2=1.23.2.1.2.4.2.6&diff_format=u
Index: php-src/ext/dom/text.c
diff -u php-src/ext/dom/text.c:1.23.2.1.2.4.2.5
php-src/ext/dom/text.c:1.23.2.1.2.4.2.6
--- php-src/ext/dom/text.c:1.23.2.1.2.4.2.5 Thu Aug 14 08:39:05 2008
+++ php-src/ext/dom/text.c Wed Sep 10 15:40:11 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: text.c,v 1.23.2.1.2.4.2.5 2008/08/14 08:39:05 tony2001 Exp $ */
+/* $Id: text.c,v 1.23.2.1.2.4.2.6 2008/09/10 15:40:11 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
