From e75980a322ea1088e1c6bf60259b8ba853d32444 Mon Sep 17 00:00:00 2001
From: Aaron McCarthy <aaron.mccarthy@nokia.com>
Date: Wed, 15 Dec 2010 15:30:43 +1000
Subject: Fix possible null pointer dereference.

When parsing a new connection an access point with the same SSID may not
have been previously seen.

Task-number: QTBUG-15276
---
 src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
index 554f9b7..f93b605 100644
--- a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
+++ b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
@@ -743,9 +743,11 @@ QNetworkConfigurationPrivate *QNetworkManagerEngine::parseConnection(const QStri
                     QNetworkConfigurationPrivatePointer ptr =
                         accessPointConfigurations.take(accessPointId);
 
-                    mutex.unlock();
-                    emit configurationRemoved(ptr);
-                    mutex.lock();
+                    if (ptr) {
+                        mutex.unlock();
+                        emit configurationRemoved(ptr);
+                        mutex.lock();
+                    }
                 }
                 break;
             }
-- 
cgit v0.12