Changeset 3330468 for protocols/msn

Timestamp:

2010-03-14T23:15:05Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

81ee561

Parents:

7c5affca (diff), 7e2b593 (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 in head.

Location:

protocols/msn

Files:

• msn.c (modified) (1 diff)
• msn.h (modified) (2 diffs)
• msn_util.c (modified) (1 diff)
• ns.c (modified) (1 diff)

protocols/msn/msn.c

@@ -26 +26 @@
 #include "nogaim.h"
 #include "msn.h"
+
+int msn_chat_id;
+GSList *msn_connections;
+GSList *msn_switchboards;
 
 static char *msn_set_display_name( set_t *set, char *value );

protocols/msn/msn.h

@@ -135 +135 @@
 #define STATUS_SB_CHAT_SPARE    8       /* Same, but also for groupchats (not used yet). */
 
-int msn_chat_id;
+extern int msn_chat_id;
 extern const struct msn_away_state msn_away_state_list[];
 extern const struct msn_status_code msn_status_code_list[];
@@ -144 +144 @@
    connection), the callback should check whether it's still listed here
    before doing *anything* else. */
-GSList *msn_connections;
-GSList *msn_switchboards;
+extern GSList *msn_connections;
+extern GSList *msn_switchboards;
 
 /* ns.c */

protocols/msn/msn_util.c

@@ -171 +171 @@
                 
                 /* End of headers? */
-                if( strncmp( text + i - 2, "\n\n", 2 ) == 0 ||
-                    strncmp( text + i - 4, "\r\n\r\n", 4 ) == 0 ||
-                    strncmp( text + i - 2, "\r\r", 2 ) == 0 )
+                if( ( i >= 4 && strncmp( text + i - 4, "\r\n\r\n", 4 ) == 0 ) ||
+                    ( i >= 2 && ( strncmp( text + i - 2, "\n\n", 2 ) == 0 ||   
+                                  strncmp( text + i - 2, "\r\r", 2 ) == 0 ) ) )
                 {
                         break;

protocols/msn/ns.c

@@ -229 +229 @@
                         }
                 }
-                else if( num_parts == 7 && strcmp( cmd[2], "OK" ) == 0 )
+                else if( num_parts >= 7 && strcmp( cmd[2], "OK" ) == 0 )
                 {
                         set_t *s;
                         
-                        http_decode( cmd[4] );
-                        
-                        strncpy( ic->displayname, cmd[4], sizeof( ic->displayname ) );
-                        ic->displayname[sizeof(ic->displayname)-1] = 0;
-                        
-                        if( ( s = set_find( &ic->acc->set, "display_name" ) ) )
-                        {
-                                g_free( s->value );
-                                s->value = g_strdup( cmd[4] );
+                        if( num_parts == 7 )
+                        {
+                                http_decode( cmd[4] );
+                                
+                                strncpy( ic->displayname, cmd[4], sizeof( ic->displayname ) );
+                                ic->displayname[sizeof(ic->displayname)-1] = 0;
+                                
+                                if( ( s = set_find( &ic->acc->set, "display_name" ) ) )
+                                {
+                                        g_free( s->value );
+                                        s->value = g_strdup( cmd[4] );
+                                }
+                        }
+                        else
+                        {
+                                imcb_log( ic, "Warning: Friendly name in server response was corrupted" );
                         }