WaveFrontReader updated to fail on non-text data files (#227)

Author: walbourn

Utilities/WaveFrontReader.h

@@ -45,6 +45,7 @@
 #endif
 
 #include <algorithm>
+#include <cctype>
 #include <cstdint>
 #include <fstream>
 #include <locale>
@@ -122,7 +123,11 @@ namespace DX
                 if (!InFile)
                     break;
 
-                if (*strCommand.c_str() == L'#')
+                if (strCommand.empty() || *strCommand.c_str() == 0)
+                {
+                    continue;
+                }
+                else if (*strCommand.c_str() == L'#')
                 {
                     // Comment
                 }
@@ -372,6 +377,11 @@ namespace DX
                         materials.emplace_back(mat);
                     }
                 }
+                else if (!std::isprint(*strCommand.c_str()))
+                {
+                    // non-printable characters outside of comments mean this is not a text file
+                    return E_FAIL;
+                }
                 else
                 {
     #ifdef _DEBUG
@@ -437,6 +447,7 @@ namespace DX
             InFile.imbue(std::locale::classic());
 
             auto curMaterial = materials.end();
+            bool foundmat = false;
 
             for (;; )
             {
@@ -445,8 +456,19 @@ namespace DX
                 if (!InFile)
                     break;
 
-                if (0 == wcscmp(strCommand.c_str(), L"newmtl"))
+                if (strCommand.empty() || *strCommand.c_str() == 0)
+                    continue;
+
+                if (*strCommand.c_str() == L'#')
+                {
+                    // Comment
+                    InFile.ignore(1000, L'\n');
+                    continue;
+                }
+                else if (0 == wcscmp(strCommand.c_str(), L"newmtl"))
                 {
+                    foundmat = true;
+
                     // Switching active materials
                     wchar_t strName[MAX_PATH] = {};
                     InFile.width(MAX_PATH);
@@ -462,16 +484,17 @@ namespace DX
                         }
                     }
                 }
+                else if (!std::isprint(*strCommand.c_str()))
+                {
+                    // non-printable characters outside of comments mean this is not a text file
+                    return E_FAIL;
+                }
 
                 // The rest of the commands rely on an active material
                 if (curMaterial == materials.end())
                     continue;
 
-                if (0 == wcscmp(strCommand.c_str(), L"#"))
-                {
-                    // Comment
-                }
-                else if (0 == wcscmp(strCommand.c_str(), L"Ka"))
+                if (0 == wcscmp(strCommand.c_str(), L"Ka"))
                 {
                     // Ambient color
                     float r, g, b;
@@ -570,7 +593,7 @@ namespace DX
 
             InFile.close();
 
-            return S_OK;
+            return (foundmat) ? S_OK : E_FAIL;
         }
 
         void Clear()

build/CompilerAndLinker.cmake

@@ -119,6 +119,14 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang|IntelLLVM")
     if(WINDOWS_STORE)
       list(APPEND COMPILER_DEFINES _SILENCE_CLANG_COROUTINE_MESSAGE)
     endif()
+
+    if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 10.0)
+      list(APPEND COMPILER_SWITCHES -Wc++20-compat)
+    endif()
+
+    if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.0)
+      list(APPEND COMPILER_SWITCHES -Wc++23-compat)
+    endif()
 elseif(CMAKE_CXX_COMPILER_ID MATCHES "Intel")
     list(APPEND COMPILER_SWITCHES /Zc:__cplusplus /Zc:inline /fp:fast /Qdiag-disable:161)
 elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")