Changeset e8c8d00 for protocols/msn/msn_util.c

Timestamp:

2010-03-17T15:15:19Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

60e4df3

Parents:

1c3008a (diff), f9928cb (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 mainline.

File:

• protocols/msn/msn_util.c (modified) (2 diffs)

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;
@@ -374 +374 @@
         *list = NULL;
         
-        imcb_log( ic, ret->str );
+        imcb_log( ic, "%s", ret->str );
         g_string_free( ret, TRUE );
 }