diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-03-12 19:10:16 +0000 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-03-12 19:10:16 +0000 |
| commit | be609ff2b0ca885612c0e6d81f82c4f26ed4f58d (patch) | |
| tree | b9f83fdc44bd00921ffb9c23035b1f39d565ba93 /protocols/msn/msn_util.c | |
| parent | 08e5bb2bb2fcc7125f837be4f225d3a9ebf320ed (diff) | |
| parent | 8b6b7405d3844271f7bff56e527bfeb1a4872975 (diff) | |
Merging mainline.
Diffstat (limited to 'protocols/msn/msn_util.c')
| -rw-r--r-- | protocols/msn/msn_util.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/protocols/msn/msn_util.c b/protocols/msn/msn_util.c index 58ad22f8..668a8b8a 100644 --- a/protocols/msn/msn_util.c +++ b/protocols/msn/msn_util.c @@ -170,9 +170,9 @@ char *msn_findheader( char *text, char *header, int len ) while( i < len && ( text[i] == '\r' || text[i] == '\n' ) ) i ++; /* 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; } @@ -373,6 +373,6 @@ void msn_msgq_purge( struct im_connection *ic, GSList **list ) g_slist_free( *list ); *list = NULL; - imcb_log( ic, ret->str ); + imcb_log( ic, "%s", ret->str ); g_string_free( ret, TRUE ); } |