From 154d58075922eddfc016e4156bc400d6ea24d39c Mon Sep 17 00:00:00 2001 From: Kurt Hindenburg Date: Sat, 28 Mar 2015 10:14:37 -0900 Subject: [PATCH] Fix hang in exiting konsole with Ctrl+D with QInputMethodQuery Add missing incrementation in for loop in decodeLine() Thanks to Takahiro Hashimoto kenya888 gmail com for research, bug and fix. BUG: 345294 REIVEW: 123143 (cherry picked from commit 7017a999d620562f7e51fd11303630bd0c4bf2ff) --- src/TerminalCharacterDecoder.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/TerminalCharacterDecoder.cpp b/src/TerminalCharacterDecoder.cpp index d185eda2..1c5fff43 100644 --- a/src/TerminalCharacterDecoder.cpp +++ b/src/TerminalCharacterDecoder.cpp @@ -116,6 +116,8 @@ void PlainTextDecoder::decodeLine(const Character* const characters, int count, const QString s = QString::fromUtf16(chars, extendedCharLength); plainText.append(s); i += qMax(1, string_width(s)); + } else { + ++i; } } else { // All characters which appear before the last real character are