# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1246669646 0
# Node ID fe242dec0d50e597d0598855a3403e83db97fb93
# Parent  33734bb78c9fa0bd10cf4efea8443cb6a41545b0# Parent  979031db48c1460c1c64dc1a4ec8b9760d0c95ec
merge of '3fe037ee4d003527c8f4f41974e01680d5eea27e'
     and 'c75c4072b910c269873d22b25bb5639d85bb1b9b'

diff -r 979031db48c1 -r fe242dec0d50 libpurple/util.c
--- a/libpurple/util.c	Sat Jul 04 01:06:23 2009 +0000
+++ b/libpurple/util.c	Sat Jul 04 01:07:26 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;", &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);