Changeset ba86713 for lib/xmltree.c

Timestamp:

2012-09-25T00:10:05Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

3901b5d

Parents:

6bef211 (diff), 2a6da96 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

More mainline merges.

File:

• lib/xmltree.c (modified) (2 diffs)

lib/xmltree.c

@@ -266 +266 @@
 {
         struct xt_parser *parser;
-        struct xt_node *ret;
+        struct xt_node *ret = NULL;
         
         if( len == 0 )
@@ -273 +273 @@
         parser = xt_new( NULL, NULL );
         xt_feed( parser, in, len );
-        ret = parser->root;
-        parser->root = NULL;
+        if( parser->cur == NULL )
+        {
+                ret = parser->root;
+                parser->root = NULL;
+        }
         xt_free( parser );