Remove/replace uninitialized status line variable in error string

Amends: bbd9f2f4f5e0fda85029fa320f793973ea607c2b

Pick-to: 6.3 6.4
Change-Id: I4af7b167e5f45ad5ead25f6421a2af8638494fd4
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>

2 files changed, 5 insertions, 3 deletions

diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp
index c13d831..085af7d 100644
--- a/src/websockets/qwebsocket_p.cpp
+++ b/src/websockets/qwebsocket_p.cpp
@@ -1032,9 +1032,12 @@ void QWebSocketPrivate::processHandshake(QTcpSocket *pSocket)
                             .arg(acceptKey, accept);
             }
         } else {
+            const QString upgradeParms = QLatin1String(
+                    "Accept-key size: %1, version: %2.%3, upgrade: %4, connection: %5").arg(
+                    QString::number(acceptKey.size()), QString::number(parser.getMajorVersion()),
+                    QString::number(parser.getMinorVersion()), upgrade, connection);
             errorDescription = QWebSocket::tr(
-                "QWebSocketPrivate::processHandshake: Invalid status line in response: %1.")
-                    .arg(QString::fromLatin1(m_statusLine));
+                "Invalid parameter(s) presented during protocol upgrade: %1").arg(upgradeParms);
         }
     } else if (parser.getStatusCode() == 400) {
         //HTTP/1.1 400 Bad Request
diff --git a/src/websockets/qwebsocket_p.h b/src/websockets/qwebsocket_p.h
index f30dfff..08770e4 100644
--- a/src/websockets/qwebsocket_p.h
+++ b/src/websockets/qwebsocket_p.h
@@ -220,7 +220,6 @@ private:
     QMaskGenerator *m_pMaskGenerator;
     QDefaultMaskGenerator m_defaultMaskGenerator;
 
-    QByteArray m_statusLine;
     quint64 m_outgoingFrameSize;
 
     friend class QWebSocketServerPrivate;