Merge pull request #16 from mer-packages/guardpendingcall

[libsignon-qt] Guard PendingCall against deletion by connected slots
sailfishos · Feb 6, 2015 · 0d83f6e · 0d83f6e
2 parents 728c2cb + dd26089
commit 0d83f6e
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/libsignon/lib/SignOn/async-dbus-proxy.cpp b/libsignon/lib/SignOn/async-dbus-proxy.cpp
@@ -30,6 +30,7 @@
 #include <QDebug>
 #include <QMetaMethod>
 #include <QMetaType>
+#include <QPointer>
 
 #include "connection-manager.h"
 #include "dbusinterface.h"
@@ -117,12 +118,16 @@ void PendingCall::onFinished(QDBusPendingCallWatcher *watcher)
         }
     }
 
+    QPointer<PendingCall> thisguard(this);
+    QPointer<QDBusPendingCallWatcher> watcherguard(watcher);
     if (watcher->isError()) {
         Q_EMIT error(watcher->error());
     } else {
         Q_EMIT success(watcher);
     }
-    Q_EMIT finished(watcher);
+    if (thisguard) {
+        Q_EMIT finished(watcherguard ? watcher : 0);
+    }
 }
 
 void PendingCall::onInterfaceDestroyed()