[Azoth OTRoid] Avoid reusing already-deleted Authenticators.

Fixes occasional crashes.
0xd34df00d · Oct 14, 2014 · 0fba4c7 · 0fba4c7
1 parent c4eab4c
commit 0fba4c7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/plugins/azoth/plugins/otroid/otrhandler.cpp b/src/plugins/azoth/plugins/otroid/otrhandler.cpp
@@ -775,6 +775,10 @@ namespace OTRoid
 				SIGNAL (initiateRequested (ICLEntry*, SmpMethod, QString, QString)),
 				this,
 				SLOT (startAuth (ICLEntry*, SmpMethod, QString, QString)));
+		connect (auth,
+				SIGNAL (destroyed ()),
+				this,
+				SLOT (handleAuthDestroyed ()));
 		Auths_ [entry] = auth;
 	}
 #endif
@@ -974,6 +978,13 @@ namespace OTRoid
 		}
 	}
 
+	void OtrHandler::handleAuthDestroyed ()
+	{
+		const auto auth = static_cast<Authenticator*> (sender ());
+		const auto key = Auths_.key (auth);
+		Auths_.remove (key);
+	}
+
 	void OtrHandler::handleGotSmpReply (SmpMethod, const QString& reply, ConnContext *context)
 	{
 		const auto& replyUtf = reply.toUtf8 ();

diff --git a/src/plugins/azoth/plugins/otroid/otrhandler.h b/src/plugins/azoth/plugins/otroid/otrhandler.h
@@ -145,6 +145,7 @@ namespace OTRoid
 #if OTRL_VERSION_MAJOR >= 4
 		void handleAuthRequested ();
 		void startAuth (ICLEntry*, SmpMethod, const QString&, const QString&);
+		void handleAuthDestroyed ();
 
 		void handleGotSmpReply (SmpMethod, const QString&, ConnContext*);
 		void handleAbortSmp (ConnContext*);