Changeset ba86713 for lib/xmltree.c


Ignore:
Timestamp:
2012-09-25T00:10:05Z (11 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:
1 edited

Legend:

Unmodified
Added
Removed
  • lib/xmltree.c

    r6bef211 rba86713  
    266266{
    267267        struct xt_parser *parser;
    268         struct xt_node *ret;
     268        struct xt_node *ret = NULL;
    269269       
    270270        if( len == 0 )
     
    273273        parser = xt_new( NULL, NULL );
    274274        xt_feed( parser, in, len );
    275         ret = parser->root;
    276         parser->root = NULL;
     275        if( parser->cur == NULL )
     276        {
     277                ret = parser->root;
     278                parser->root = NULL;
     279        }
    277280        xt_free( parser );
    278281       
Note: See TracChangeset for help on using the changeset viewer.