test.cpp: added test to make sure the leak with empty headers no longer occurs

do not treat directories like regular files in existence checks

added the file/directory existence functions from Cppcheck

Author: firewave

simplecpp.cpp

@@ -53,8 +53,10 @@
 
 #ifdef _WIN32
 #  include <direct.h>
+using mode_t = unsigned short;
 #else
 #  include <sys/stat.h>
+#  include <sys/types.h>
 #endif
 
 static bool isHex(const std::string &s)
@@ -3039,9 +3041,11 @@ static std::string openHeaderDirect(std::ifstream &f, const std::string &path)
     if (nonExistingFilesCache.contains(path))
         return "";  // file is known not to exist, skip expensive file open call
 #endif
-    f.open(path.c_str());
-    if (f.is_open())
-        return path;
+    if (simplecpp::isFile(path)) {
+        f.open(path.c_str());
+        if (f.is_open())
+            return path;
+    }
 #ifdef SIMPLECPP_WINDOWS
     nonExistingFilesCache.add(path);
 #endif
@@ -3175,6 +3179,9 @@ bool simplecpp::FileDataCache::getFileId(const std::string &path, FileID &id)
     if (stat(path.c_str(), &statbuf) != 0)
         return false;
 
+    if ((statbuf.st_mode & S_IFMT) != S_IFREG)
+        return false;
+
     id.dev = statbuf.st_dev;
     id.ino = statbuf.st_ino;
 
@@ -3951,3 +3958,21 @@ std::string simplecpp::getCppStdString(const std::string &std)
 {
     return getCppStdString(getCppStd(std));
 }
+
+static mode_t file_type(const std::string &path)
+{
+    struct stat file_stat;
+    if (stat(path.c_str(), &file_stat) == -1)
+        return 0;
+    return file_stat.st_mode & S_IFMT;
+}
+
+bool simplecpp::isFile(const std::string &path)
+{
+    return file_type(path) == S_IFREG;
+}
+
+bool simplecpp::isDirectory(const std::string &path)
+{
+    return file_type(path) == S_IFDIR;
+}

simplecpp.h

@@ -440,6 +440,20 @@ namespace simplecpp {
         bool removeComments{}; /** remove comment tokens from included files */
     };
 
+    /**
+     * @brief Checks if given path is a file
+     * @param path Path to be checked
+     * @return true if given path is a file
+     */
+    SIMPLECPP_LIB bool isFile(const std::string &path);
+
+    /**
+     * @brief Checks if a given path is a directory
+     * @param path Path to be checked
+     * @return true if given path is a directory
+     */
+    SIMPLECPP_LIB bool isDirectory(const std::string &path);
+
     struct SIMPLECPP_LIB FileData {
         /** The canonical filename associated with this data */
         std::string filename;

test.cpp

@@ -2217,6 +2217,44 @@ static void missingHeader4()
     ASSERT_EQUALS("file0,1,syntax_error,No header in #include\n", toString(outputList));
 }
 
+#ifndef _WIN32
+static void missingHeader5()
+{
+    // this is a directory
+    const char code[] = "#include \"/\"\n";
+    simplecpp::OutputList outputList;
+    ASSERT_EQUALS("", preprocess(code, &outputList));
+    ASSERT_EQUALS("file0,1,missing_header,Header not found: \"/\"\n", toString(outputList));
+}
+
+static void missingHeader6()
+{
+    // this is a directory
+    const char code[] = "#include \"/usr\"\n";
+    simplecpp::OutputList outputList;
+    ASSERT_EQUALS("", preprocess(code, &outputList));
+    ASSERT_EQUALS("file0,1,missing_header,Header not found: \"/usr\"\n", toString(outputList));
+}
+
+static void missingHeader7()
+{
+    // this is a directory
+    const char code[] = "#include </>\n";
+    simplecpp::OutputList outputList;
+    ASSERT_EQUALS("", preprocess(code, &outputList));
+    ASSERT_EQUALS("file0,1,missing_header,Header not found: </>\n", toString(outputList));
+}
+
+static void missingHeader8()
+{
+    // this is a directory
+    const char code[] = "#include </usr>\n";
+    simplecpp::OutputList outputList;
+    ASSERT_EQUALS("", preprocess(code, &outputList));
+    ASSERT_EQUALS("file0,1,missing_header,Header not found: </usr>\n", toString(outputList));
+}
+#endif
+
 static void nestedInclude()
 {
     const char code[] = "#include \"test.h\"\n";
@@ -3523,6 +3561,14 @@ static void leak()
                             "#define e\n";
         (void)preprocess(code, simplecpp::DUI());
     }
+    {
+        const char code[] = "#include</\\\\>\n"
+                            "#include</\\\\>\n";
+        simplecpp::OutputList outputList;
+        ASSERT_EQUALS("", preprocess(code, &outputList));
+        ASSERT_EQUALS("file0,1,missing_header,Header not found: </\\\\>\n"
+                      "file0,2,missing_header,Header not found: </\\\\>\n", toString(outputList));
+    }
 }
 
 int main(int argc, char **argv)
@@ -3705,6 +3751,12 @@ int main(int argc, char **argv)
     TEST_CASE(missingHeader2);
     TEST_CASE(missingHeader3);
     TEST_CASE(missingHeader4);
+#ifndef _WIN32
+    TEST_CASE(missingHeader5);
+    TEST_CASE(missingHeader6);
+    TEST_CASE(missingHeader7);
+    TEST_CASE(missingHeader8);
+#endif
     TEST_CASE(nestedInclude);
     TEST_CASE(systemInclude);
     TEST_CASE(circularInclude);