Changeset e437366

Timestamp:

2010-07-16T23:55:53Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

177ffd7

Parents:

4346c3f4

Message:

Fix possible crash on trying to use half-created OSCAR chatrooms.

File:

• protocols/oscar/oscar.c (modified) (4 diffs)

protocols/oscar/oscar.c

@@ -2431 +2431 @@
         char *s;
         
-        ccon = c->data;
+        if (!(ccon = c->data))
+                return;
                 
         for (s = message; *s; s++)
@@ -2472 +2473 @@
         struct im_connection *ic = c->ic;
         struct oscar_data * od = (struct oscar_data *)ic->proto_data;
-        struct chat_connection *ccon = c->data;
+        struct chat_connection *ccon;
+        
+        if (!(ccon = c->data))
+                return;
         
         aim_chat_invite(od->sess, od->conn, who, message ? message : "",
@@ -2497 +2501 @@
 void oscar_chat_leave(struct groupchat *c)
 {
+        if (!c->data)
+                return;
         oscar_chat_kill(c->ic, c->data);
 }
@@ -2528 +2534 @@
         struct groupchat *ret;
         static int chat_id = 0;
-        char * chatname;
+        char * chatname, *s;
         struct groupchat *c;
         
         chatname = g_strdup_printf("%s%s%d", isdigit(*ic->acc->user) ? "icq" : "",
                                    ic->acc->user, chat_id++);
+        
+        for (s = chatname; *s; s ++)
+                if (!isalnum(*s))
+                        *s = '0';
         
         c = imcb_chat_new(ic, chatname);