diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2019-06-27 11:38:43 +0200 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2019-06-28 12:54:43 +0200 |
| commit | e19d93b212d71521b7edd3a7e45e4b9319cd5c72 (patch) | |
| tree | e981454d7b066e569b74c310d9e651eff59c9f3d /src | |
| parent | d1141b6c90e53554f69fd6a7a272988211f5bd34 (diff) | |
QSocks5SocketEngine: avoid dereferencing null-pointer
The header argument is optional
Change-Id: I035e11db5ee70183274afb48ba67c4d3ed2f615d
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/socket/qsocks5socketengine.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/network/socket/qsocks5socketengine.cpp b/src/network/socket/qsocks5socketengine.cpp index dd2bc90855..6791b85273 100644 --- a/src/network/socket/qsocks5socketengine.cpp +++ b/src/network/socket/qsocks5socketengine.cpp @@ -1611,8 +1611,10 @@ qint64 QSocks5SocketEngine::readDatagram(char *data, qint64 maxlen, QIpPacketHea QSocks5RevivedDatagram datagram = d->udpData->pendingDatagrams.dequeue(); int copyLen = qMin<int>(maxlen, datagram.data.size()); memcpy(data, datagram.data.constData(), copyLen); - header->senderAddress = datagram.address; - header->senderPort = datagram.port; + if (header) { + header->senderAddress = datagram.address; + header->senderPort = datagram.port; + } return copyLen; #else Q_UNUSED(data) |