pidgin/pidgin

Merge release-2.x.y

2014-05-15, Tomasz Wasilczyk
f986ac8e9e0c
Parents d73e41243b71b621a018a338
Children 9e2fc11fc387
Merge release-2.x.y
1 files changed, 1 insertions(+), 1 deletions(-)
  • +1 -1
    libpurple/proxy.c
    • --- a/libpurple/proxy.c Thu May 15 17:59:31 2014 +0200
    +++ b/libpurple/proxy.c Thu May 15 21:08:51 2014 +0200
    @@ -1723,7 +1723,7 @@
    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;