diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-29 01:00:33 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-29 01:00:34 +0200 |
| commit | 134ee9d548c1289f8bb4c7fb5302db37a9437dfe (patch) | |
| tree | 28bcb842a92c69a3244a969948dd0425f92cbe44 /src/network | |
| parent | df7c97f8eed00a1dcd24a815d89d2842f7d6d116 (diff) | |
| parent | 57eed823e412d587e051bff0d4775f08024d4169 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I4cb91777e7ae9f462fa219d5b9ebeb277fde49c3
Diffstat (limited to 'src/network')
| -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 23aec12390..e6ffdc3ac5 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) |