changeset 26216:9f84925079d5

merge of 'ab47b66449b213d6fbfc728cc1e8c161bed87755' and 'd1d23cd05745079a820abdcd2310300d0be33c50'
author Ka-Hing Cheung <khc@hxbc.us>
date Thu, 26 Mar 2009 05:15:04 +0000
parents 5e5d230f5862 (current diff) 7988bbd25151 (diff)
children 9aa672807759
files
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/yahoo/yahoo_packet.c	Thu Mar 26 03:25:57 2009 +0000
+++ b/libpurple/protocols/yahoo/yahoo_packet.c	Thu Mar 26 05:15:04 2009 +0000
@@ -201,6 +201,8 @@
 		}
 		pos += 2;
 
+		if (pos + 1 > len) break;
+
 		/* Skip over garbage we've noticed in the mail notifications */
 		if (data[0] == '9' && data[pos] == 0x01)
 			pos++;