Fix #12251 internalError while cppcheck tries to parse Clang AST (dan…

…mar#5755)
chrchr-github · Dec 12, 2023 · 2c54f31 · 2c54f31
1 parent 30e8814
commit 2c54f31
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/lib/clangimport.cpp b/lib/clangimport.cpp
@@ -509,7 +509,7 @@ void clangimport::AstNode::setLocations(TokenList *tokenList, int file, int line
         } else if (ext[0] == '<') {
             const std::string::size_type colon = ext.find(':');
             if (colon != std::string::npos) {
-                const bool windowsPath = colon == 2 && ext.size() > 4 && ext[3] == '\\';
+                const bool windowsPath = colon == 2 && ext.size() > 3 && ext[2] == ':';
                 const std::string::size_type sep1 = windowsPath ? ext.find(':', 4) : colon;
                 const std::string::size_type sep2 = ext.find(':', sep1 + 1);
                 file = tokenList->appendFileIfNew(ext.substr(1, sep1 - 1));

diff --git a/test/testclangimport.cpp b/test/testclangimport.cpp
@@ -589,6 +589,9 @@ class TestClangImport : public TestFixture {
 
         clang = "`-CXXRecordDecl 0x34cc5f8 <C:\\Foo\\Bar Baz\\1.cpp:2:1, col:7> col:7 class Foo";
         ASSERT_EQUALS("class Foo ;", parse(clang));
+
+        clang = "`-CXXRecordDecl 0x34cc5f8 <C:/Foo/Bar Baz/1.cpp:2:1, col:7> col:7 class Foo";
+        ASSERT_EQUALS("class Foo ;", parse(clang));
     }
 
     void cxxRecordDecl2() {