From: Frederik Gladhorn <frederik.gladhorn@digia.com>
Date: Fri, 17 Jan 2014 18:44:13 +0000 (+0100)
Subject: one if (m_mustMask) is enough
X-Git-Tag: v5.3.0-alpha1~68
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f09baa9295db1327d99ab98e7ccd4f6296056d1c;p=contrib%2Fqtwebsockets.git

one if (m_mustMask) is enough

Change-Id: I6cb89b981b70f10510319bfb51b77874e2a4d85a
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
---

diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp
index e00f209..8c86aba 100644
--- a/src/websockets/qwebsocket_p.cpp
+++ b/src/websockets/qwebsocket_p.cpp
@@ -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);