[Bugfix] Fix past-the-end iterator dereference

Sirraide · Oct 29, 2023 · 519559e · 519559e
1 parent 508e188
commit 519559e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -138,6 +138,7 @@ if (FCHK_FORCE_RELEASE)
     endif()
 else()
     if (NOT MSVC)
+        target_compile_definitions(_fchk_options INTERFACE _GLIBCXX_DEBUG)
         target_compile_options(_fchk_options INTERFACE
             $<$<CONFIG:DEBUG>:-O0 -g3 -ggdb3>
             $<$<CONFIG:RELEASE>:-O3 -march=native>

diff --git a/src/core.cc b/src/core.cc
@@ -7,8 +7,8 @@
 #include <pcre2.h>
 
 #ifdef _WIN32
-    #define NOMINMAX
-    #include <Windows.h>
+#    define NOMINMAX
+#    include <Windows.h>
 #endif
 
 auto utils::Drain(FILE* f) -> std::string {
@@ -139,7 +139,7 @@ auto GetProcessOutput(std::string_view cmd) -> std::string {
 #endif
 }
 
-}
+} // namespace
 
 /// ===========================================================================
 ///  Location
@@ -752,6 +752,7 @@ class Matcher {
         if (
             in == input_lines.end() or
             chk == ctx->checks.end() or
+            std::next(chk) == ctx->checks.end() or
             std::next(chk)->dir == Directive::CheckNot or
             std::next(chk)->dir == Directive::RegexCheckNot or
             std::next(chk)->dir == Directive::InternalCheckNotEmpty