diff options
| author | Øystein Heskestad <oystein.heskestad@qt.io> | 2021-06-21 08:53:10 +0200 |
|---|---|---|
| committer | Øystein Heskestad <oystein.heskestad@qt.io> | 2021-06-30 09:11:21 +0200 |
| commit | 30b0376f2b20013b6e687979f0be53791a48b3f0 (patch) | |
| tree | d2688eef68ca8a185e9854a740bfcdd26a8be154 | |
| parent | 62bcf8810f097e4fa13112a0cc7185e4abd34d29 (diff) | |
| download | qtwebsockets-30b0376f2b20013b6e687979f0be53791a48b3f0.tar.gz | |
Clear frame before emitting signals to prevent duplicating messages
[ChangeLog] Clear frame before emitting signals to prevent duplicating messages
Fixes: QTBUG-87279
Change-Id: Iab296f443943eeec3b2a0fbb4f79c5abb2605ca7
(cherry picked from commit d196801706821a890bda8b22508c2957a50eff25)
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | src/websockets/qwebsocketdataprocessor.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/websockets/qwebsocketdataprocessor.cpp b/src/websockets/qwebsocketdataprocessor.cpp index b2a9b57..1141335 100644 --- a/src/websockets/qwebsocketdataprocessor.cpp +++ b/src/websockets/qwebsocketdataprocessor.cpp @@ -202,6 +202,7 @@ bool QWebSocketDataProcessor::process(QIODevice *pIoDevice) return true; } + bool isFinalFrame = frame.isFinalFrame(); if (m_opCode == QWebSocketProtocol::OpCodeText) { QString frameTxt = m_pTextCodec->toUnicode(frame.payload().constData(), frame.payload().size(), @@ -215,14 +216,17 @@ bool QWebSocketDataProcessor::process(QIODevice *pIoDevice) return true; } else { m_textMessage.append(frameTxt); - Q_EMIT textFrameReceived(frameTxt, frame.isFinalFrame()); + frame.clear(); + Q_EMIT textFrameReceived(frameTxt, isFinalFrame); } } else { m_binaryMessage.append(frame.payload()); - Q_EMIT binaryFrameReceived(frame.payload(), frame.isFinalFrame()); + QByteArray payload = frame.payload(); + frame.clear(); + Q_EMIT binaryFrameReceived(payload, isFinalFrame); } - if (frame.isFinalFrame()) { + if (isFinalFrame) { isDone = true; if (m_opCode == QWebSocketProtocol::OpCodeText) { const QString textMessage(m_textMessage); |