Possibly fix danmar#1369 (Internal error - double-declared enum followed by another enum)

aggro80 · aggro80 · commit faced1b48365 · 2010-02-09T22:26:15.000+02:00
http://sourceforge.net/apps/trac/cppcheck/ticket/1369 Don't include same file twice if one is a/a.h and other is a/../a/a.h
diff --git a/lib/filelister.cpp b/lib/filelister.cpp
@@ -59,8 +59,9 @@ std::string FileLister::simplifyPath(const char *originalPath)
 
     for (std::vector<std::string>::size_type i = 0; i < pathParts.size(); ++i)
     {
-        if (pathParts[i] == ".." && i > 1)
+        if (pathParts[i] == ".." && i > 1 && pathParts.size() > i + 1)
         {
+            pathParts.erase(pathParts.begin() + i + 1);
             pathParts.erase(pathParts.begin() + i);
             pathParts.erase(pathParts.begin() + i - 1);
             pathParts.erase(pathParts.begin() + i - 2);
diff --git a/lib/preprocessor.cpp b/lib/preprocessor.cpp
@@ -1262,28 +1262,16 @@ void Preprocessor::handleIncludes(std::string &code, const std::string &filename
         if (headerType == 0)
             continue;
 
-        std::string tempFile = filename;
-        std::transform(tempFile.begin(), tempFile.end(), tempFile.begin(), tolowerWrapper);
-        if (handledFiles.find(tempFile) != handledFiles.end())
-        {
-            // We have processed this file already once, skip
-            // it this time to avoid ethernal loop.
-            continue;
-        }
-
-        handledFiles.insert(tempFile);
-
         // filename contains now a file name e.g. "menu.h"
         std::string processedFile;
         bool fileOpened = false;
+        std::ifstream fin;
         for (std::list<std::string>::const_iterator iter = includePaths.begin(); iter != includePaths.end(); ++iter)
         {
-            std::ifstream fin;
             fin.open((*iter + filename).c_str());
             if (fin.is_open())
             {
                 filename = *iter + filename;
-                processedFile = Preprocessor::read(fin, filename, _settings);
                 fileOpened = true;
                 break;
             }
@@ -1292,14 +1280,30 @@ void Preprocessor::handleIncludes(std::string &code, const std::string &filename
         if (headerType == 1 && !fileOpened)
         {
             filename = paths.back() + filename;
-            std::ifstream fin(filename.c_str());
+            fin.open(filename.c_str());
             if (fin.is_open())
             {
-                processedFile = Preprocessor::read(fin, filename, _settings);
                 fileOpened = true;
             }
         }
 
+        if (fileOpened)
+        {
+            std::string tempFile = FileLister::simplifyPath(filename.c_str());
+            std::transform(tempFile.begin(), tempFile.end(), tempFile.begin(), tolowerWrapper);
+            if (handledFiles.find(tempFile) != handledFiles.end())
+            {
+                // We have processed this file already once, skip
+                // it this time to avoid ethernal loop.
+                continue;
+            }
+
+            handledFiles.insert(tempFile);
+            std::ifstream fin(filename.c_str());
+            processedFile = Preprocessor::read(fin, filename, _settings);
+            fin.close();
+        }
+
         if (processedFile.length() > 0)
         {
             // Replace all tabs with spaces..
diff --git a/test/testfilelister.cpp b/test/testfilelister.cpp
@@ -45,6 +45,8 @@ class TestFileLister : public TestFixture
         ASSERT_EQUALS("/index.h", FileLister::simplifyPath("/path/../other/../index.h"));
         ASSERT_EQUALS("/index.h", FileLister::simplifyPath("/path/../other///././../index.h"));
         ASSERT_EQUALS("../path/index.h", FileLister::simplifyPath("../path/other/../index.h"));
+        ASSERT_EQUALS("a/index.h", FileLister::simplifyPath("a/../a/index.h"));
+        ASSERT_EQUALS("a/..", FileLister::simplifyPath("a/.."));
     }
 
 

Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,9 @@ std::string FileLister::simplifyPath(const char *originalPath)`
`59`	`59`
`60`	`60`	`for (std::vector<std::string>::size_type i = 0; i < pathParts.size(); ++i)`
`61`	`61`	`{`
`62`		`- if (pathParts[i] == ".." && i > 1)`
	`62`	`+ if (pathParts[i] == ".." && i > 1 && pathParts.size() > i + 1)`
`63`	`63`	`{`
	`64`	`+ pathParts.erase(pathParts.begin() + i + 1);`
`64`	`65`	`pathParts.erase(pathParts.begin() + i);`
`65`	`66`	`pathParts.erase(pathParts.begin() + i - 1);`
`66`	`67`	`pathParts.erase(pathParts.begin() + i - 2);`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,8 @@ class TestFileLister : public TestFixture`
`45`	`45`	`ASSERT_EQUALS("/index.h", FileLister::simplifyPath("/path/../other/../index.h"));`
`46`	`46`	`ASSERT_EQUALS("/index.h", FileLister::simplifyPath("/path/../other///././../index.h"));`
`47`	`47`	`ASSERT_EQUALS("../path/index.h", FileLister::simplifyPath("../path/other/../index.h"));`
	`48`	`+ ASSERT_EQUALS("a/index.h", FileLister::simplifyPath("a/../a/index.h"));`
	`49`	`+ ASSERT_EQUALS("a/..", FileLister::simplifyPath("a/.."));`
`48`	`50`	`}`
`49`	`51`
`50`	`52`