← Back to branch summary

~ubuntu-branches/ubuntu/wily/psi/wily-proposed

« back to all changes in this revision

Viewing changes to cutestuff/network/socks.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Andreas Wenning
  • Date: 2009-05-04 07:41:20 UTC
  • mfrom: (6.1.1 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090504074120-iui3exld9scpfwrd
Tags: 0.12.1-1ubuntu1
* Merge with Debian unstable; remaining Ubuntu changes:
  - Upstream commit d440f16e1241915fed1d859c93ab54cb738112af; applied
    inline. To make psi work with Qt 4.5
  - debian-control: Don't build-depend on Qt << 4.5.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
cutestuff/network/socks.cpp
261
261
                return -1;
262
262
        if(from->size() < 2)
263
263
                return 0;
264
 
        int num = from->at(1);
 
264
        unsigned char mlen = from->at(1);
 
265
        int num = mlen;
265
266
        if(num > 16) // who the heck has over 16 auth methods??
266
267
                return -1;
267
268
        if(from->size() < 2 + num)