[kopete/f20] kopete crashes when OTR plugin is selected (#1056693)

[Rex Dieter]

commit 93a01c18b0208aea2acc40ffde6e6418637bff7c
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Wed Jan 22 12:03:08 2014 -0600

    kopete crashes when OTR plugin is selected (#1056693)

 0248-Workaround-issue-in-libotr-4.0.0.patch |   38 +++++++++++++++++++++++++++
 kopete.spec                                 |    9 +++++-
 2 files changed, 45 insertions(+), 2 deletions(-)
---
diff --git a/0248-Workaround-issue-in-libotr-4.0.0.patch b/0248-Workaround-issue-in-libotr-4.0.0.patch
new file mode 100644
index 0000000..cd78329
--- /dev/null
+++ b/0248-Workaround-issue-in-libotr-4.0.0.patch
@@ -0,0 +1,38 @@
+From 5e25a663ca77c22533e7f77277ca84f2af838e9d Mon Sep 17 00:00:00 2001
+From: Michael Zanetti <mzanetti at kde.org>
+Date: Mon, 6 Jan 2014 13:20:07 +0100
+Subject: [PATCH 248/249] Workaround issue in libotr 4.0.0.
+
+This still has an issue with fragmentation as long as libotr 4.0.1 is
+not released, but at least it doesn't crash.
+
+CCBUG: 328999
+---
+ plugins/otr/otrlchatinterface.cpp | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/plugins/otr/otrlchatinterface.cpp b/plugins/otr/otrlchatinterface.cpp
+index 2b8e806..f248d85 100644
+--- a/plugins/otr/otrlchatinterface.cpp
++++ b/plugins/otr/otrlchatinterface.cpp
+@@ -236,10 +236,15 @@ void OtrlChatInterface::still_secure(void *opdata, ConnContext *context, int is_
+ }
+ 
+ int OtrlChatInterface::max_message_size(void *opdata, ConnContext *context){
+-	Kopete::ChatSession *session= ((Kopete::ChatSession*)opdata);
+-
+ 	Q_UNUSED(context)
+ 
++	if (!opdata) {
++		kDebug(14318) << "Trying to determine max message size of unknown session. Fragmentation will not work.";
++		return 0;
++	}
++
++	Kopete::ChatSession *session= ((Kopete::ChatSession*)opdata);
++
+ 	kDebug(14318) << session->protocol()->pluginId();
+ 
+ 	if( session->protocol()->pluginId() == "WlmProtocol" ){
+-- 
+1.8.5.3
+
diff --git a/kopete.spec b/kopete.spec
index 5f3d22f..e4b6c27 100644
--- a/kopete.spec
+++ b/kopete.spec
@@ -7,7 +7,7 @@
 Name:    kopete
 Summary: Instant messenger
 Version: 4.11.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2+ and GFDL
 #URL:    https://projects.kde.org/projects/kde/kdenetwork/%{name}
@@ -27,8 +27,9 @@ Patch4: kdenetwork-4.10.0-kopete_system_iris.patch
 
 ## upstream patches (4.11)
 
-## upstream patches (master)
+## upstream patches
 Patch0141: 0141-ported-otr-plugin-to-libotr-4.0.0.patch
+Patch0248: 0248-Workaround-issue-in-libotr-4.0.0.patch
 
 # support linphone-3.6.1+, see https://bugs.kde.org/318825
 %if 0%{?fedora} > 18
@@ -122,6 +123,7 @@ mv kopete/protocols/jabber/libiris \
 
 %if 0%{?fedora} > 19
 %patch0141 -p1 -b .0141
+%patch0248 -p1 -b .0248
 %endif
 
 
@@ -221,6 +223,9 @@ fi
 
 
 %changelog
+* Wed Jan 22 2014 Rex Dieter <rdieter at fedoraproject.org> - 4.11.5-2
+- kopete crashes when OTR plugin is selected (#1056693)
+
 * Sat Jan 04 2014 Rex Dieter <rdieter at fedoraproject.org> - 4.11.5-1
 - 4.11.5