merge of '9a2385174d89041192de0b2c3239d635206b1cd8'

Sat, 04 Jul 2009 01:16:21 +0000

author
Stu Tomlinson <nosnilmot@pidgin.im>
date
Sat, 04 Jul 2009 01:16:21 +0000
changeset 27518
cd2b24154a2b
parent 27517
9a2385174d89 (current diff)
parent 27516
7593283f2c4c (diff)
child 27519
aba49eea4417

merge of '9a2385174d89041192de0b2c3239d635206b1cd8'
and '7593283f2c4cf90f95ad776877ad6ae9f8bcd8a9'

--- a/libpurple/util.c	Sat Jul 04 01:07:26 2009 +0000
+++ b/libpurple/util.c	Sat Jul 04 01:16:21 2009 +0000
@@ -3797,7 +3797,7 @@
 	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;\r\n", &sz) != 1)
+			sscanf(s, "%" G_GSIZE_MODIFIER "x;", &sz) != 1)
 		{
 			purple_debug_error("util", "Error processing chunked data: "
 					"Expected data length, found: %s\n", s);

mercurial