diff -Nru konversation-1.5/debian/changelog konversation-1.5/debian/changelog --- konversation-1.5/debian/changelog 2014-11-04 18:50:21.000000000 +0000 +++ konversation-1.5/debian/changelog 2017-11-21 23:11:40.000000000 +0000 @@ -1,3 +1,13 @@ +konversation (1.5-1ubuntu1.14.04.2) trusty-security; urgency=high + + * SECURITY UPDATE: Crash in IRC message parsing (LP: #1731797): + - kubuntu_03_CVE-2017-15923.diff: ensure integer overflow has not + happened + - CVE-2017-15923 + - https://www.kde.org/info/security/advisory-20171112-1.txt + + -- Simon Quigley Tue, 21 Nov 2017 15:11:10 -0800 + konversation (1.5-1ubuntu1.14.04.1) trusty-security; urgency=medium * SECURITY UPDATE: out-of-bounds read on a heap-allocated array LP: #1389296 diff -Nru konversation-1.5/debian/patches/kubuntu_03_CVE-2017-15923.diff konversation-1.5/debian/patches/kubuntu_03_CVE-2017-15923.diff --- konversation-1.5/debian/patches/kubuntu_03_CVE-2017-15923.diff 1970-01-01 00:00:00.000000000 +0000 +++ konversation-1.5/debian/patches/kubuntu_03_CVE-2017-15923.diff 2017-11-21 23:11:07.000000000 +0000 @@ -0,0 +1,31 @@ +Description: Stay within bounds + This patch fixes CVE-2017-15923. +Author: Eli MacKenzie +Origin: upstream +Bug: https://www.kde.org/info/security/advisory-20171112-1.txt +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1731797 +Applied-Upstream: 6a7f59ee1b9dbc6e5cf9e5f3b306504d02b73ef0 +Reviewed-by: Eike Hein +Last-Update: 2017-11-12 +--- a/src/viewer/ircview.cpp ++++ b/src/viewer/ircview.cpp +@@ -1637,7 +1637,8 @@ QString IRCView::closeToTagString(TextHt + } + + // reopen relevant tags +- ret += openTags(data, i); ++ if (i > -1) ++ ret += openTags(data, i); + + return ret; + } +@@ -1645,7 +1646,8 @@ QString IRCView::closeToTagString(TextHt + QString IRCView::openTags(TextHtmlData* data, int from) + { + QString ret, tag; +- int i = from; ++ int i = from > -1 ? from : 0; ++ + for ( ; i < data->openHtmlTags.count(); ++i) + { + tag = data->openHtmlTags.at(i); diff -Nru konversation-1.5/debian/patches/series konversation-1.5/debian/patches/series --- konversation-1.5/debian/patches/series 2014-11-04 17:05:19.000000000 +0000 +++ konversation-1.5/debian/patches/series 2017-11-21 23:11:07.000000000 +0000 @@ -2,3 +2,4 @@ #debian_channel.diff kubuntu_01_default_channels.diff kubuntu_02_cve-2014-8483.diff +kubuntu_03_CVE-2017-15923.diff