summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforminputcontexts
diff options
context:
space:
mode:
authorRobert Loehning <robert.loehning@qt.io>2017-06-07 14:06:33 +0200
committerRobert Loehning <robert.loehning@qt.io>2017-08-23 12:11:03 +0000
commita576954f9b96d2777d8cce09be31eb3f62e0e882 (patch)
tree33f45b18a1eb8e203bb0db1b9df9e928aa3b2946 /src/plugins/platforminputcontexts
parentb65e30c861af308d142c36b5f96f1a4cfedde1f3 (diff)
QTableGenerator: Fix handling of illegal characters in fromBase8
Task-number: QTBUG-60387 Change-Id: I084c2b4a86439857e898e9adc7370c19961d0126 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/plugins/platforminputcontexts')
-rw-r--r--src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
index ca9f7af127..809aa68365 100644
--- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
+++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
@@ -520,7 +520,7 @@ static inline int fromBase8(const char *s, const char *end)
{
int result = 0;
while (*s && s != end) {
- if (*s <= '0' && *s >= '7')
+ if (*s <= '0' || *s >= '7')
return 0;
result *= 8;
result += *s - '0';