/pidgin/main: f986ac8e9e0c: Merge release-2.x.y

[Tomasz Wasilczyk]

Changeset: f986ac8e9e0cc007c32625f9bd847553651a111a
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-05-15 21:08 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/f986ac8e9e0c

Description:

Merge release-2.x.y

diffstat:

 libpurple/proxy.c |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff --git a/libpurple/proxy.c b/libpurple/proxy.c
--- a/libpurple/proxy.c
+++ b/libpurple/proxy.c
@@ -1723,7 +1723,7 @@ s5_parse_chap_msg(PurpleProxyConnectData
 	navas = *cmdbuf;
 
 	purple_debug_misc("socks5 proxy", "Expecting %d attribute(s).\n", navas);
-	if (G_UNLIKELY(navas > 10000)) { /* XXX: what's the threshold? */
+	if (G_UNLIKELY(navas < 0 || navas > 10000)) { /* XXX: what's the threshold? */
 		purple_proxy_connect_data_disconnect(connect_data,
 			_("Received invalid data on connection with server"));
 		return -1;