Changeset ccba980 for protocols

Timestamp:

2009-12-17T00:42:25Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

1c2eaa3

Parents:

ec29351

Message:

A few fixes for bugs that caused coredumps on testing.bitlbee.org (or
caught my attention in new compiler warnings).

Location:

protocols

Files:

• msn/msn_util.c (modified) (1 diff)
• yahoo/libyahoo2.c (modified) (3 diffs)

protocols/msn/msn_util.c

@@ -374 +374 @@
         *list = NULL;
         
-        imcb_log( ic, ret->str );
+        imcb_log( ic, "%s", ret->str );
         g_string_free( ret, TRUE );
 }

protocols/yahoo/libyahoo2.c

@@ -1530 +1530 @@
                         newbud = y_new0(struct yahoo_buddy, 1);
                         newbud->id = strdup(pair->value);
-                        if(cur_group)
+                        if (cur_group) {
                                 newbud->group = strdup(cur_group);
-                        else {
-                                struct yahoo_buddy *lastbud = (struct yahoo_buddy *)y_list_nth(
-                                                                yd->buddies, y_list_length(yd->buddies)-1)->data;
-                                newbud->group = strdup(lastbud->group);
+                        } else {
+                                YList *last;
+                                struct yahoo_buddy *lastbud;
+                                
+                                for (last = yd->buddies; last && last->next; last = last->next);
+                                if (last) {
+                                        lastbud = last->data;
+                                        newbud->group = strdup(lastbud->group);
+                                } else {
+                                        newbud->group = strdup("Buddies");
+                                }
                         }
 
@@ -2393 +2400 @@
 {
         struct yahoo_https_auth_data *had = req->data;
-        struct yahoo_input_data *yid = had->yid;
-        struct yahoo_data *yd = yid->yd;
+        struct yahoo_input_data *yid;
+        struct yahoo_data *yd;
         int st;
+        
+        if (y_list_find(inputs, had->yid) == NULL)
+                return;
+        
+        yid = had->yid;
+        yd = yid->yd;
         
         if (req->status_code != 200) {
@@ -2436 +2449 @@
 {
         struct yahoo_https_auth_data *had = req->data;
-        struct yahoo_input_data *yid = had->yid;
-        struct yahoo_data *yd = yid->yd;
+        struct yahoo_input_data *yid;
+        struct yahoo_data *yd;
         struct yahoo_packet *pack;
-        char *crumb;
+        char *crumb = NULL;
         int st;
+        
+        if (y_list_find(inputs, had->yid) == NULL)
+                return;
+        
+        yid = had->yid;
+        yd = yid->yd;
         
         md5_byte_t result[16];