From a576954f9b96d2777d8cce09be31eb3f62e0e882 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Wed, 7 Jun 2017 14:06:33 +0200 Subject: QTableGenerator: Fix handling of illegal characters in fromBase8 Task-number: QTBUG-60387 Change-Id: I084c2b4a86439857e898e9adc7370c19961d0126 Reviewed-by: Oswald Buddenhagen Reviewed-by: Lars Knoll --- src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/plugins/platforminputcontexts') 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'; -- cgit v1.2.3