Clear frame before emitting signals to prevent duplicating messages

[ChangeLog] Clear frame before emitting signals to prevent duplicating messages

Fixes: QTBUG-87279
Pick-to: 6.2
Change-Id: Iab296f443943eeec3b2a0fbb4f79c5abb2605ca7
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 7 insertions, 3 deletions

diff --git a/src/websockets/qwebsocketdataprocessor.cpp b/src/websockets/qwebsocketdataprocessor.cpp
index e1319c6..b02fa08 100644
--- a/src/websockets/qwebsocketdataprocessor.cpp
+++ b/src/websockets/qwebsocketdataprocessor.cpp
@@ -198,6 +198,7 @@ bool QWebSocketDataProcessor::process(QIODevice *pIoDevice)
                     return true;
                 }
 
+                bool isFinalFrame = frame.isFinalFrame();
                 if (m_opCode == QWebSocketProtocol::OpCodeText) {
                     QString frameTxt = m_decoder(frame.payload());
                     if (Q_UNLIKELY(m_decoder.hasError())) {
@@ -207,14 +208,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);