Changes in / [5d9b792:0a69d7b]

Location:

protocols

Files:

• http_client.c (modified) (1 diff)
• oscar/chat.c (modified) (2 diffs)
• oscar/oscar.c (modified) (2 diffs)

protocols/http_client.c

@@ -240 +240 @@
 
 got_reply:
-        /* Maybe if the webserver is overloaded, or when there's bad SSL
-           support... */
-        if( req->bytes_read == 0 )
-                goto cleanup;
-        
         /* Zero termination is very convenient. */
         req->reply_headers[req->bytes_read] = 0;

protocols/oscar/chat.c

@@ -163 +163 @@
                  the right charset flags, as we also do with normal
                  messages. Hope this will work. :-) */
-        /*
         if (flags & AIM_CHATFLAGS_UNICODE)
                 aimbs_put16(&fr->data, 0x0002);
@@ -172 +171 @@
         
         aimbs_put16(&fr->data, 0x0000);
-        */
         
         /*

protocols/oscar/oscar.c

@@ -138 +138 @@
         int i, j;
         char *x = strchr(name, '-');
-        if (!x) return g_strdup(name);
+        if (!x) return NULL;
         x = strchr(++x, '-');
-        if (!x) return g_strdup(name);
+        if (!x) return NULL;
         tmp = g_strdup(++x);
 
@@ -2607 +2607 @@
         int ret;
         static int chat_id = 0;
-        char * chatname;
-        
-        chatname = g_strdup_printf("%s%d", gc->username, chat_id++);
+        char * chatname = g_new0(char, strlen(gc->username)+4);
+        
+        g_snprintf(chatname, strlen(gc->username) + 4, "%s%d", gc->username, chat_id++);
   
         ret = oscar_chat_join(gc, chatname);