pidgin: 3fe037ee: We're about to assume strstr() will find...

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: 3fe037ee4d003527c8f4f41974e01680d5eea27e
Ancestor: dc960b2ad7b32fa7d865552300a003a71689cfe9
Author: nosnilmot at pidgin.im
Date: 2009-07-04T00:59:44
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3fe037ee4d003527c8f4f41974e01680d5eea27e

Modified files:
        libpurple/util.c

ChangeLog: 

We're about to assume strstr() will find \r\n, so make the sscanf() 
ensure it is actually there.


-------------- next part --------------
============================================================
--- libpurple/util.c	908a3adc318a03c75205b97c88cce616b6c81c17
+++ libpurple/util.c	ed50784f906547104a4da5094bcd75cae6c4cf7e
@@ -3797,7 +3797,7 @@ process_chunked_data(char *data, gsize *
 	while (*s) {
 		/* Read the size of this chunk */
 		if (sscanf(s, "%" G_GSIZE_MODIFIER "x\r\n", &sz) != 1 &&
-			sscanf(s, "%" G_GSIZE_MODIFIER "x;", &sz) != 1)
+			sscanf(s, "%" G_GSIZE_MODIFIER "x;\r\n", &sz) != 1)
 		{
 			purple_debug_error("util", "Error processing chunked data: "
 					"Expected data length, found: %s\n", s);