From 4b87afbbe6132b03d114cce1cbb7958cf1f3bac8 Mon Sep 17 00:00:00 2001
From: Tasuku Suzuki <tasuku.suzuki@kdab.com>
Date: Wed, 12 Feb 2020 17:06:32 +0900
Subject: Fix crash when CONNECT method is used
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When the parser received "CONNECT / HTTP/1.1\n\n", its upgrade variable
is set to 1 even though there is no "upgrade" header available.
In this case, QMap::find() returns its end.

Task-number: QTBUG-82053
Change-Id: I41cc23511459c6735a474bb7b903638dd4b1208f
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
---
 src/httpserver/qabstracthttpserver.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/httpserver/qabstracthttpserver.cpp b/src/httpserver/qabstracthttpserver.cpp
index 26e6e97..262ec9b 100644
--- a/src/httpserver/qabstracthttpserver.cpp
+++ b/src/httpserver/qabstracthttpserver.cpp
@@ -116,8 +116,8 @@ void QAbstractHttpServerPrivate::handleReadyRead(QTcpSocket *socket,
                 return;
             }
 #endif
+            qCWarning(lcHttpServer, "Upgrade to %s not supported", it.value().second.constData());
         }
-        qCWarning(lcHttpServer, "Upgrade to %s not supported", it.value().second.constData());
         socket->disconnectFromHost();
         return;
     }
-- 
cgit v1.2.3