im.pidgin.pidgin.2.2.3: 1a134c1150b507c3505ee1c948644ff0831d62d2

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: 1a134c1150b507c3505ee1c948644ff0831d62d2
Ancestor: 0dc5edb3f0a938a69a58ebe98f8303f96fed05b7
Author: rekkanoryo at pidgin.im
Date: 2007-11-09T08:32:29
Branch: im.pidgin.pidgin.2.2.3

Modified files:
        libpurple/protocols/yahoo/yahoo_packet.c

ChangeLog: 

applied changes from 1d36a128301cae57a790a087aa9c4ad8d71dad52
             through 7ea551cdfc72cb2ec310d0d54d2a7e5badf7535e

-------------- next part --------------
============================================================
--- libpurple/protocols/yahoo/yahoo_packet.c	cb6d13aad2b6f48eb92d2ae45940dd52a5cf2d15
+++ libpurple/protocols/yahoo/yahoo_packet.c	4e9ef698e4c7088c88e9e3563513f6d1544adde9
@@ -174,8 +174,7 @@ void yahoo_packet_read(struct yahoo_pack
 		}
 
 		if (accept) {
-			/* TODO: strstr() should not be used here because data isn't NULL terminated */
-			delimiter = (const guchar *)strstr((char *)&data[pos], "\xc0\x80");
+			delimiter = (const guchar *)g_strstr_len((const char *)&data[pos], len - pos, "\xc0\x80");
 			if (delimiter == NULL)
 			{
 				/* Malformed packet! (It doesn't end in 0xc0 0x80) */