rrichards               Sun Jan  2 07:09:09 2005 EDT

  Modified files:              (Branch: PHP_5_0)
    /php-src/ext/libxml libxml.c 
  Log:
  MFH: Fixed bug #31361 (simplexml/domxml segfault when adding node twice)
  
http://cvs.php.net/diff.php/php-src/ext/libxml/libxml.c?r1=1.18.2.5&r2=1.18.2.6&ty=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.18.2.5 
php-src/ext/libxml/libxml.c:1.18.2.6
--- php-src/ext/libxml/libxml.c:1.18.2.5        Tue Nov  9 03:13:04 2004
+++ php-src/ext/libxml/libxml.c Sun Jan  2 07:09:09 2005
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: libxml.c,v 1.18.2.5 2004/11/09 08:13:04 dmitry Exp $ */
+/* $Id: libxml.c,v 1.18.2.6 2005/01/02 12:09:09 rrichards Exp $ */
 
 #define IS_EXT_MODULE
 
@@ -711,6 +711,10 @@
                ret_refcount = php_libxml_decrement_node_ptr(object TSRMLS_CC);
                if (ret_refcount == 0) {
                        php_libxml_node_free_resource(nodep TSRMLS_CC);
+               } else {
+                       if (obj_node && object == obj_node->_private) {
+                               obj_node->_private = NULL;
+                       }
                }
                /* Safe to call as if the resource were freed then doc pointer 
is NULL */
                php_libxml_decrement_doc_ref(object TSRMLS_CC);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to