pidgin: 604a08e5: Hey Stu, it should be safe to combine th...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 604a08e51ae1e1fb1b3ffd4c82446c148029c700
Ancestor: d97da8f9cf87658421693170c812b3ae061ca577
Author: markdoliner at pidgin.im
Date: 2009-07-06T05:37:06
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/604a08e51ae1e1fb1b3ffd4c82446c148029c700

Modified files:
        libpurple/util.c

ChangeLog: 

Hey Stu, it should be safe to combine this check, right?  It'll make us
allow a few broken things, like if the length is 12aQ we'll parse the
length as x12a, but that's not too important, right?

I signed on to my Yahoo accounts and was able to fetch the icons from
the two people who have them.

-------------- next part --------------
============================================================
--- libpurple/util.c	c0d936e8bc2bf3b33677a3eac85f0c31dce5bcb5
+++ libpurple/util.c	f6ef2470ab7580fae3232c1ebff14393caa8dde0
@@ -3796,8 +3796,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)
+		if (sscanf(s, "%" G_GSIZE_MODIFIER "x", &sz) != 1)
 		{
 			purple_debug_error("util", "Error processing chunked data: "
 					"Expected data length, found: %s\n", s);