Changeset ea728e6 for protocols/jabber/si.c

Timestamp:

2010-08-24T12:19:52Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

b78c4b9

Parents:

9b1d2d6 (diff), bd599b9 (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:

Merging mainline.

File:

• protocols/jabber/si.c (modified) (2 diffs)

protocols/jabber/si.c

@@ -262 +262 @@
                                 break;
                         }
+                        else
+                        {
+                                c = c->next;
+                        }
 
                 if ( !requestok )
@@ -373 +377 @@
 {
         struct xt_node *c, *d;
-        char *ini_jid, *tgt_jid, *iq_id, *cmp;
+        char *ini_jid = NULL, *tgt_jid, *iq_id, *cmp;
         GSList *tflist;
         struct jabber_transfer *tf=NULL;