[SCM] konsole packaging branch, master, updated. debian/16.12.0-1-15-gc4bb01c

Maximiliano Curia maxy at moszumanska.debian.org
Mon Mar 27 12:31:44 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/konsole.git;a=commitdiff;h=02ccf0e

The following commit has been merged in the master branch:
commit 02ccf0e4ee150d164aae728f82541ecdb56b41a6
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Mar 27 13:44:08 2017 +0200

    Add upstream patch: Screen-Fix-potential-crash-when-ExtendedCharTable-tries-t.patch
---
 ...ntial-crash-when-ExtendedCharTable-tries-t.patch | 21 +++++++++++++++++++++
 debian/patches/series                               |  1 +
 2 files changed, 22 insertions(+)

diff --git a/debian/patches/Screen-Fix-potential-crash-when-ExtendedCharTable-tries-t.patch b/debian/patches/Screen-Fix-potential-crash-when-ExtendedCharTable-tries-t.patch
new file mode 100644
index 0000000..7f86c94
--- /dev/null
+++ b/debian/patches/Screen-Fix-potential-crash-when-ExtendedCharTable-tries-t.patch
@@ -0,0 +1,21 @@
+From: "Martin T. H. Sandsmark" <martin.sandsmark at kde.org>
+Date: Sun, 22 Jan 2017 18:20:54 +0100
+Subject: Screen: Fix potential crash when ExtendedCharTable tries to clean
+
+---
+ src/Screen.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Screen.h b/src/Screen.h
+index aaa282eb..443d0ecf 100644
+--- a/src/Screen.h
++++ b/src/Screen.h
+@@ -580,7 +580,7 @@ public:
+         QSet<ushort> result;
+         for (int i = 0; i < _lines; ++i) {
+             const ImageLine& il = _screenLines[i];
+-            for (int j = 0; j < _columns; ++j) {
++            for (int j = 0; j < il.length(); ++j) {
+                 if (il[j].rendition & RE_EXTENDED_CHAR) {
+                     result << il[j].character;
+                 }
diff --git a/debian/patches/series b/debian/patches/series
index b543c56..4104da7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ upstream_render_text_at_primary_fonts_baseline.patch
 Add-nofork-as-compatibility-alias-for-separate.patch
 Fix-build.patch
 TerminalDisplay-Abort-painting-invalid-rect.patch
+Screen-Fix-potential-crash-when-ExtendedCharTable-tries-t.patch

-- 
konsole packaging



More information about the pkg-kde-commits mailing list