From a7e0d6ebdc30bc8dc3b0d5117517605464702cc5 Mon Sep 17 00:00:00 2001 From: Vladimir Belyavsky Date: Fri, 15 Sep 2023 18:00:11 +0300 Subject: [PATCH] QNetworkConnectionEvents: fix potential nullptr access Fix potential nullptr access in QNetworkConnectionEvents::getNetworkConnectionFromAdapterGuid(). This can happen if for some reason the NetworkListManager instance failed to be instantiated in QNetworkConnectionEvents constructor. Fixes: QTBUG-117097 Pick-to: 6.5 Change-Id: If51ea383e22461a6c3124576c4e1be3f30dde1f6 Reviewed-by: Timur Pocheptsov (cherry picked from commit 6b4cc9bf7358176890630879dbdd08f6d4535bd9) Reviewed-by: Qt Cherry-pick Bot --- src/network/kernel/qnetconmonitor_win.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/network/kernel/qnetconmonitor_win.cpp b/src/network/kernel/qnetconmonitor_win.cpp index 64bd90b0ad0..bf6aff1e468 100644 --- a/src/network/kernel/qnetconmonitor_win.cpp +++ b/src/network/kernel/qnetconmonitor_win.cpp @@ -167,6 +167,12 @@ QNetworkConnectionEvents::~QNetworkConnectionEvents() ComPtr QNetworkConnectionEvents::getNetworkConnectionFromAdapterGuid(QUuid guid) { + if (!networkListManager) { + qCDebug(lcNetMon) << "Failed to enumerate network connections:" + << "NetworkListManager was not instantiated"; + return nullptr; + } + ComPtr connections; auto hr = networkListManager->GetNetworkConnections(connections.GetAddressOf()); if (FAILED(hr)) {