one if (m_mustMask) is enough
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 17 Jan 2014 18:44:13 +0000 (19:44 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Fri, 17 Jan 2014 23:20:27 +0000 (00:20 +0100)
Change-Id: I6cb89b981b70f10510319bfb51b77874e2a4d85a
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
src/websockets/qwebsocket_p.cpp

index e00f209..8c86aba 100644 (file)
@@ -318,16 +318,16 @@ void QWebSocketPrivate::close(QWebSocketProtocol::CloseCode closeCode, QString r
         return;
     if (!m_isClosingHandshakeSent) {
         Q_Q(QWebSocket);
-        quint32 maskingKey = 0;
-        if (m_mustMask)
-            maskingKey = generateMaskingKey();
         const quint16 code = qToBigEndian<quint16>(closeCode);
         QByteArray payload;
         payload.append(static_cast<const char *>(static_cast<const void *>(&code)), 2);
         if (!reason.isEmpty())
             payload.append(reason.toUtf8());
-        if (m_mustMask)
+        quint32 maskingKey = 0;
+        if (m_mustMask) {
+            maskingKey = generateMaskingKey();
             QWebSocketProtocol::mask(payload.data(), payload.size(), maskingKey);
+        }
         QByteArray frame = getFrameHeader(QWebSocketProtocol::OC_CLOSE,
                                           payload.size(), maskingKey, true);
         frame.append(payload);