Merge remote-tracking branch 'origin/tqtc/lts-5.15.6' into tqtc/lts-5.15-opensourcev5.15.6-lts-lgpl

Change-Id: Ia4e6ffc419e24148f37c89e661ad7b2558f53371

1 files changed, 7 insertions, 3 deletions

diff --git a/src/websockets/qwebsocketdataprocessor.cpp b/src/websockets/qwebsocketdataprocessor.cpp
index e2cc291..2affdd5 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);