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

List:       kde-commits
Subject:    [konsole] src: Prevent crashes upon startup and/or new tab when using input methods
From:       Kurt Hindenburg <kurt.hindenburg () gmail ! com>
Date:       2015-02-28 15:40:34
Message-ID: E1YRjVK-0008BO-OG () scm ! kde ! org
[Download RAW message or body]

Git commit 7986af1d253c409e34b2d7aeae7032fdaccb64e5 by Kurt Hindenburg.
Committed on 28/02/2015 at 15:39.
Pushed by hindenburg into branch 'master'.

Prevent crashes upon startup and/or new tab when using input methods

TerminalDisplay::inputMethodQuery causes crashes when using non-standard
input methods.   Qt::ImSurroundingText was trying to use lineProperties
of the current line, but this parameter is ignored in decodeLine anyway.

Thanks to Takahiro Hashimoto kenya888 gmail com for report, research
and patch

BUG: 341798

M  +1    -1    src/TerminalDisplay.cpp

http://commits.kde.org/konsole/7986af1d253c409e34b2d7aeae7032fdaccb64e5

diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp
index b152f83..dbd6247 100644
--- a/src/TerminalDisplay.cpp
+++ b/src/TerminalDisplay.cpp
@@ -2827,7 +2827,7 @@ QVariant TerminalDisplay::inputMethodQuery(Qt::InputM=
ethodQuery query) const
         QTextStream stream(&lineText);
         PlainTextDecoder decoder;
         decoder.begin(&stream);
-        decoder.decodeLine(&_image[loc(0, cursorPos.y())], _usedColumns, _=
lineProperties[cursorPos.y()]);
+        decoder.decodeLine(&_image[loc(0, cursorPos.y())], _usedColumns, L=
INE_DEFAULT);
         decoder.end();
         return lineText;
     }
[prev in list] [next in list] [prev in thread] [next in thread]