Changeset 699376f7


Ignore:
Timestamp:
2010-03-21T00:39:45Z (9 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
54a2014
Parents:
b8a491d
Message:

Read the from attribute from the main stanza, not the inside query. Also
fixing another potential NULL pointer dereference.

Location:
protocols/jabber
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • protocols/jabber/iq.c

    rb8a491d r699376f7  
    660660        char *feature, *xmlns, *from;
    661661
    662         if( !( c = xt_find_node( node->children, "query" ) ) ||
    663             !( from = xt_find_attr( c, "from" ) ) ||
     662        if( !( from = xt_find_attr( node, "from" ) ) ||
     663            !( c = xt_find_node( node->children, "query" ) ) ||
    664664            !( xmlns = xt_find_attr( c, "xmlns" ) ) ||
    665665            !( strcmp( xmlns, XMLNS_DISCO_INFO ) == 0 ) )
  • protocols/jabber/si.c

    rb8a491d r699376f7  
    250250                while( ( c = xt_find_node( c, "option" ) ) )
    251251                        if( ( d = xt_find_node( c->children, "value" ) ) &&
     252                            ( d->text != NULL ) &&
    252253                            ( strcmp( d->text, XMLNS_BYTESTREAMS ) == 0 ) )
    253254                        {
Note: See TracChangeset for help on using the changeset viewer.