[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kopete/KDE/4.13] plugins/otr: Fix crashing in otr plugin, AuthenticationWizard::findWizard() can re
From:       Pali_Rohár <pali.rohar () gmail ! com>
Date:       2014-05-14 8:45:15
Message-ID: E1WkUoN-0005vD-BR () scm ! kde ! org
[Download RAW message or body]

Git commit a9fa66186d7278b752d3dac850fcc2eb0caf2ec9 by Pali Rohár.
Committed on 13/05/2014 at 20:25.
Pushed by pali into branch 'KDE/4.13'.

Fix crashing in otr plugin, AuthenticationWizard::findWizard() can return NULL

BUG: 330693
FIXED-IN: 4.13.2

M  +4    -1    plugins/otr/otrlchatinterface.cpp

http://commits.kde.org/kopete/a9fa66186d7278b752d3dac850fcc2eb0caf2ec9

diff --git a/plugins/otr/otrlchatinterface.cpp b/plugins/otr/otrlchatinterface.cpp
index f248d85..b35011e 100644
--- a/plugins/otr/otrlchatinterface.cpp
+++ b/plugins/otr/otrlchatinterface.cpp
@@ -381,7 +381,10 @@ void OtrlChatInterface::handle_smp_event(void *opdata, OtrlSMPEvent smp_event, C
 	case OTRL_SMPEVENT_ABORT :
 	case OTRL_SMPEVENT_CHEATED :
 	case OTRL_SMPEVENT_ERROR :
-		AuthenticationWizard::findWizard(chatSession)->finished(false, false);
+		AuthenticationWizard *wizard = AuthenticationWizard::findWizard(chatSession);
+		if (wizard) {
+			wizard->finished(false, false);
+		}
 		OtrlChatInterface::self()->abortSMP( context, chatSession );
 		break;
 	}
[prev in list] [next in list] [prev in thread] [next in thread]