diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2018-06-19 18:28:36 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-06-19 17:23:10 +0000 |
| commit | ba64b7d013fb95fb7b3afe9f1724edae7fcca2ed (patch) | |
| tree | 9aaddf6c214b41999a584129e63282b443734ca9 /src/plugins | |
| parent | 9333ea8649838d7e0400b0e94c8cbd4fa5d216b0 (diff) | |
| parent | 5100d558742c682d83e0d4033d78ed4c9f521f56 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
src/plugins/qmltooling/packetprotocol/qpacketprotocol.cpp
src/qml/compiler/qv4codegen.cpp
tests/auto/qml/debugger/qv4debugger/tst_qv4debugger.cpp
Change-Id: I010505326d76ee728ffe5fbd4c7879f28adadb12
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/qmltooling/packetprotocol/qpacketprotocol.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/qmltooling/packetprotocol/qpacketprotocol.cpp b/src/plugins/qmltooling/packetprotocol/qpacketprotocol.cpp index 791c09810e..c736b6414d 100644 --- a/src/plugins/qmltooling/packetprotocol/qpacketprotocol.cpp +++ b/src/plugins/qmltooling/packetprotocol/qpacketprotocol.cpp @@ -45,8 +45,6 @@ QT_BEGIN_NAMESPACE -static const int MAX_PACKET_SIZE = 0x7FFFFFFF; - /*! \class QPacketProtocol \internal @@ -246,7 +244,7 @@ void QPacketProtocol::readyToRead() } // Check sizing constraints - if (d->inProgressSize > MAX_PACKET_SIZE) { + if (d->inProgressSize < qint32(sizeof(qint32))) { disconnect(d->dev, &QIODevice::readyRead, this, &QPacketProtocol::readyToRead); disconnect(d->dev, &QIODevice::aboutToClose, this, &QPacketProtocol::aboutToClose); disconnect(d->dev, &QIODevice::bytesWritten, this, &QPacketProtocol::bytesWritten); |