diff options
| author | hjk <qtc-committer@nokia.com> | 2010-06-02 09:57:23 +0200 |
|---|---|---|
| committer | hjk <qtc-committer@nokia.com> | 2010-06-02 09:57:23 +0200 |
| commit | 5806009d29d587c0daa791ae91eef2c21fe9c66b (patch) | |
| tree | 3c33e49eae5f113f91d8402214edf15927ae7aff /src/libs/3rdparty | |
| parent | 89687ddd4bf383853fd93145f0f71419ad2103a1 (diff) | |
| parent | 13e042737fb0fa0af8c6ba690be68a2ddf96ac07 (diff) | |
| download | qt-creator-5806009d29d587c0daa791ae91eef2c21fe9c66b.tar.gz | |
Merge remote branch 'origin/2.0'
Conflicts:
doc/qtcreator.qdoc
src/plugins/debugger/debuggermanager.cpp
src/plugins/texteditor/basetexteditor.cpp
Diffstat (limited to 'src/libs/3rdparty')
| -rw-r--r-- | src/libs/3rdparty/net7ssh/src/ne7ssh_sftp.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/libs/3rdparty/net7ssh/src/ne7ssh_sftp.cpp b/src/libs/3rdparty/net7ssh/src/ne7ssh_sftp.cpp index 0663301200..61d325634e 100644 --- a/src/libs/3rdparty/net7ssh/src/ne7ssh_sftp.cpp +++ b/src/libs/3rdparty/net7ssh/src/ne7ssh_sftp.cpp @@ -108,10 +108,11 @@ bool Ne7sshSftp::handleData (Botan::SecureVector<Botan::byte>& packet) commBuffer.addVector (sftpBuffer); mainBuffer.addVector (sftpBuffer); - len = mainBuffer.getInt(); + if (mainBuffer.length() < sizeof(uint32) + || mainBuffer.getInt() > mainBuffer.length()) + return true; - if (len > mainBuffer.length()) return true; - else commBuffer.clear(); + commBuffer.clear(); _cmd = mainBuffer.getByte(); |