Fix random crashes when bearer suddenly goes down

1. QNetworkSession being deleted from the closed signal caused data
   abort or E32User-CBase 49 panics. (both observed)
2. Potential E32User-CBase 46 panic in
   ConnectionProgressNotifier::StartNotifications()

Reviewed-by: Aaron Tunney
Reviewed-By: Markus Goetz

Task-Number: QTBUG-17196

1 files changed, 3 insertions, 3 deletions

diff --git a/src/plugins/bearer/symbian/qnetworksession_impl.cpp b/src/plugins/bearer/symbian/qnetworksession_impl.cpp
index 433eef6..741f8c5 100644
--- a/src/plugins/bearer/symbian/qnetworksession_impl.cpp
+++ b/src/plugins/bearer/symbian/qnetworksession_impl.cpp
@@ -1552,8 +1552,8 @@ void ConnectionProgressNotifier::StartNotifications()
 {
     if (!IsActive()) {
         SetActive();
+        iConnection.ProgressNotification(iProgress, iStatus);
     }
-    iConnection.ProgressNotification(iProgress, iStatus);
 }
 
 void ConnectionProgressNotifier::StopNotifications()
@@ -1569,10 +1569,10 @@ void ConnectionProgressNotifier::DoCancel()
 void ConnectionProgressNotifier::RunL()
 {
     if (iStatus == KErrNone) {
-        QT_TRYCATCH_LEAVING(iOwner.handleSymbianConnectionStatusChange(iProgress().iStage, iProgress().iError));
-    
         SetActive();
         iConnection.ProgressNotification(iProgress, iStatus);
+        // warning, this object may be deleted in the callback - do nothing after handleSymbianConnectionStatusChange
+        QT_TRYCATCH_LEAVING(iOwner.handleSymbianConnectionStatusChange(iProgress().iStage, iProgress().iError));
     }
 }