Changeset 75ec2c8

Timestamp:

2010-03-10T23:58:47Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

8b6b740

Parents:

a0bd4c2

Message:

Fixed an "off-by -1" bug in msn_findheader() that could probably be triggered
by incoming messages without headers.

File:

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

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;