From d580d6cd7d3ff24b820d9ea383cb9e766f4416f4 Mon Sep 17 00:00:00 2001
From: dec05eba <dec05eba@protonmail.com>
Date: Wed, 7 Jul 2021 22:25:52 +0200
Subject: More protections under debug builds

---
 backend/ninja/Ninja.cpp | 7 +++----
 src/main.cpp            | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/backend/ninja/Ninja.cpp b/backend/ninja/Ninja.cpp
index be78ba1..d2465b4 100644
--- a/backend/ninja/Ninja.cpp
+++ b/backend/ninja/Ninja.cpp
@@ -383,13 +383,12 @@ namespace backend
                 {
                     case OPT_LEV_DEBUG:
                     {
-                        // TODO: Add _GLIBCXX_DEBUG
                         std::vector<ninja::NinjaArg> result = {
                             ninja::NinjaArg::createRaw("-O0 -g3"),
-                            ninja::NinjaArg::createRaw("-D_GLIBCXX_ASSERTIONS"),
+                            ninja::NinjaArg::createRaw("-D_GLIBCXX_ASSERTIONS -Wformat -Werror=format-security"),
                             ninja::NinjaArg::createRaw("-fasynchronous-unwind-tables"),
-                            ninja::NinjaArg::createRaw("-D_DEBUG"),
-                            ninja::NinjaArg::createRaw("-fno-omit-frame-pointer"),
+                            ninja::NinjaArg::createRaw("-D_DEBUG -D_GLIBCXX_DEBUG"),
+                            ninja::NinjaArg::createRaw("-fno-omit-frame-pointer -fstack-clash-protection -fcf-protection"),
                         };
                         if(config.use_lto)
                             result.push_back(ninja::NinjaArg::createRaw("-flto"));
diff --git a/src/main.cpp b/src/main.cpp
index ecb0e99..a1136c4 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1495,7 +1495,7 @@ int wmain(int argc, const _tinydir_char_t **argv)
         }
         else
         {
-            ferr << "Expected command to be either 'build', 'new' or 'test', was: " << arg << endl << endl;
+            ferr << "Invalid command " << arg << endl << endl;
             usage();
         }
     }
-- 
cgit v1.2.3