summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMÃ¥rten Nordheim <marten.nordheim@qt.io>2020-11-19 11:21:09 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2020-11-19 13:31:22 +0000
commit83189474ad1cb07174e60fe2f27780067378dfa8 (patch)
treed14fdcdc8501c9929ac5a5855373f20f35ddd9d2
parent0a37b2ce754a9cb7850af7cc9cc0ce783eb5ff8c (diff)
QSocks5SocketEngine: Fix out-of-bounds access of QBA
This should've been caught a long time ago, but long story short: it wasn't. This has been deprecated since 5.14 and is now asserting. Change-Id: Iddee22b1a68e5d1a03006831f795db8ec1c472be Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> (cherry picked from commit 456699da93323ca3ad56ca8f16aa3197dec380e6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/network/socket/qsocks5socketengine.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/network/socket/qsocks5socketengine.cpp b/src/network/socket/qsocks5socketengine.cpp
index 4f866e4da0..3a046fd116 100644
--- a/src/network/socket/qsocks5socketengine.cpp
+++ b/src/network/socket/qsocks5socketengine.cpp
@@ -1641,9 +1641,7 @@ qint64 QSocks5SocketEngine::writeDatagram(const char *data, qint64 len, const QI
QByteArray outBuf;
outBuf.reserve(270 + len);
- outBuf[0] = 0x00;
- outBuf[1] = 0x00;
- outBuf[2] = 0x00;
+ outBuf.append(3, '\0');
if (!qt_socks5_set_host_address_and_port(header.destinationAddress, header.destinationPort, &outBuf)) {
}
outBuf += QByteArray(data, len);