From 3c02b9b96841348d4d6d6036b8ed430b02e67d8a Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Fri, 12 May 2017 14:32:20 +0200 Subject: [PATCH] C++: Fix invalid read in isQtReservedWord() The change CPlusPlus: Fix isQtReservedWord commit 7d76dd007954ee48182beb2adf17dab5df5fbea8 enabled the problematic code path. Change-Id: Ic89e3976b07ad55976c474f9c4b6d6f6cf64d29e Reviewed-by: Orgad Shaneh --- src/libs/cplusplus/pp-engine.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/cplusplus/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp index 5f2e543c52e..3ef5e2c38e0 100644 --- a/src/libs/cplusplus/pp-engine.cpp +++ b/src/libs/cplusplus/pp-engine.cpp @@ -99,7 +99,7 @@ static bool isQtReservedWord(const char *name, int size) size -= 2; switch (size) { case 1: - return name[2] == 'D' || name[2] == 'Q'; + return name[0] == 'D' || name[0] == 'Q'; case 4: return same(name, "SLOT", size) || same(name, "EMIT", size); case 5: