Fix #12929: ValueType: char literal '\'' gets valuetype 'int'

danmar · Jul 11, 2024 · 9ac1525 · 9ac1525
1 parent 223a9ad
commit 9ac1525
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
@@ -7422,7 +7422,7 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
             } else if (tok->isLong()) {
                 valuetype.originalTypeName = "wchar_t";
                 valuetype.type = ValueType::Type::WCHAR_T;
-            } else if ((tok->tokType() == Token::eChar) && ((!tok->isCpp() && tok->isCChar()) || (tok->isCMultiChar()))) {
+            } else if ((tok->tokType() == Token::eChar) && ((!tok->isCpp() && tok->isCChar()) || (tok->isCMultiChar() && !isPrefixStringCharLiteral(tok->str(), '\'', "\'\\")))) {
                 valuetype.type = ValueType::Type::INT;
                 valuetype.sign = ValueType::Sign::SIGNED;
             }

diff --git a/test/testsymboldatabase.cpp b/test/testsymboldatabase.cpp
@@ -8887,6 +8887,7 @@ class TestSymbolDatabase : public TestFixture {
 
         // char
         ASSERT_EQUALS("char", typeOf("'a';", "'a'", true));
+        ASSERT_EQUALS("char", typeOf("'\\\'';", "'\\\''", true));
         ASSERT_EQUALS("signed int", typeOf("'a';", "'a'", false));
         ASSERT_EQUALS("wchar_t", typeOf("L'a';", "L'a'", true));
         ASSERT_EQUALS("wchar_t", typeOf("L'a';", "L'a'", false));