rrichards               Tue Dec  9 16:56:43 2003 EDT

  Modified files:              
    /php-src/ext/dom    node.c 
  Log:
  fix possible mem leak when element has children
  
Index: php-src/ext/dom/node.c
diff -u php-src/ext/dom/node.c:1.18 php-src/ext/dom/node.c:1.19
--- php-src/ext/dom/node.c:1.18 Tue Dec  9 15:19:44 2003
+++ php-src/ext/dom/node.c      Tue Dec  9 16:56:42 2003
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: node.c,v 1.18 2003/12/09 20:19:44 wez Exp $ */
+/* $Id: node.c,v 1.19 2003/12/09 21:56:42 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -154,8 +154,7 @@
        char *str = NULL;
 
        nodep = dom_object_get_node(obj);
-/* TODO: Element node is invalid for this property -
-currently here as a convience method while developing */
+       /* Access to Element node is implemented as a convience method */
        switch (nodep->type) {
                case XML_ATTRIBUTE_NODE:
                case XML_TEXT_NODE:
@@ -193,7 +192,9 @@
 
        nodep = dom_object_get_node(obj);
 
+       /* Access to Element node is implemented as a convience method */
        switch (nodep->type) {
+               case XML_ELEMENT_NODE:
                case XML_ATTRIBUTE_NODE:
                        if (nodep->children) {
                                node_list_unlink(nodep->children TSRMLS_CC);
@@ -202,7 +203,6 @@
                case XML_COMMENT_NODE:
                case XML_CDATA_SECTION_NODE:
                case XML_PI_NODE:
-               case XML_ELEMENT_NODE:
                        convert_to_string(newval);
                        xmlNodeSetContentLen(nodep, Z_STRVAL_P(newval), 
Z_STRLEN_P(newval) + 1);
                        break;

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

Reply via email to