From 27b1d1a1b24c37786c2cd1f9bdbe5917d97a4772 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Tue, 11 Aug 2020 11:28:21 +0200 Subject: HTTP/2: Don't handle Remote Disconnected if we haven't switched yet In that case we haven't created the h2 handler yet, so it will crash when trying to access various members. Task-number: QTBUG-85902 Change-Id: Id0699ff06ef67748a16622703f731db0b0867771 Reviewed-by: Timur Pocheptsov --- src/network/access/qhttpnetworkconnectionchannel.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/network/access') diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp index ba05e75794..b85d718f5f 100644 --- a/src/network/access/qhttpnetworkconnectionchannel.cpp +++ b/src/network/access/qhttpnetworkconnectionchannel.cpp @@ -979,7 +979,8 @@ void QHttpNetworkConnectionChannel::_q_error(QAbstractSocket::SocketError socket // this check is under this condition in 'if'): if (protocolHandler.data()) { if (connection->connectionType() == QHttpNetworkConnection::ConnectionTypeHTTP2Direct - || connection->connectionType() == QHttpNetworkConnection::ConnectionTypeHTTP2) { + || (connection->connectionType() == QHttpNetworkConnection::ConnectionTypeHTTP2 + && switchedToHttp2)) { auto h2Handler = static_cast(protocolHandler.data()); h2Handler->handleConnectionClosure(); protocolHandler.reset(); -- cgit v1.2.3