Changeset 21d48d9 for protocols

Timestamp:

2010-03-14T20:19:10Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

7e2b593

Parents:

90cd6c4

Message:

Fix for bug #536: No longer fail on corrupted USR responses with certain
Unicode characters in the friendly name.

File:

• protocols/msn/ns.c (modified) (1 diff)

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" );
                         }