Changeset 699376f7

Timestamp:

2010-03-21T00:39:45Z (15 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:

• iq.c (modified) (1 diff)
• si.c (modified) (1 diff)

protocols/jabber/iq.c

@@ -660 +660 @@
         char *feature, *xmlns, *from;
 
-        if( !( c = xt_find_node( node->children, "query" ) ) ||
-            !( from = xt_find_attr( c, "from" ) ) ||
+        if( !( from = xt_find_attr( node, "from" ) ) ||
+            !( c = xt_find_node( node->children, "query" ) ) ||
             !( xmlns = xt_find_attr( c, "xmlns" ) ) ||
             !( strcmp( xmlns, XMLNS_DISCO_INFO ) == 0 ) )

protocols/jabber/si.c

@@ -250 +250 @@
                 while( ( c = xt_find_node( c, "option" ) ) )
                         if( ( d = xt_find_node( c->children, "value" ) ) &&
+                            ( d->text != NULL ) &&
                             ( strcmp( d->text, XMLNS_BYTESTREAMS ) == 0 ) )
                         {