annocheck: Also fail if -D_FORTIFY_SOURCE is present by -D_GLIBCXX_ASSERTIONS is...

diff --git a/annocheck/hardened.c b/annocheck/hardened.c
index e2d16b4d5c00e6c7fc4cc87ae7f819f21186acf7..b8b990361e43493889eb8c7c2e93a2f605c27c7c 100644 (file)
--- a/annocheck/hardened.c
+++ b/annocheck/hardened.c
@@ -2588,6 +2588,12 @@ show_GLIBCXX_ASSERTIONS (annocheck_data * data, test * results)
          else
            maybe (data, "Some parts of the binary do not record whether -D_GLIBCXX_ASSERTIONS was used");
        }
+      /* If we know that we have seen -D_FORTIFY_SOURCE then we should also
+        have seen -D_GLIBCXX_ASSERTIONS.  Hence its absence is a failure.  */
+      else if (tests[TEST_FORTIFY].num_pass > 0)
+       {
+         fail (data, "The binary was compiled without -D_GLIBCXX_ASSERTIONS");
+       }
       else
        maybe (data, "The -D_GLIBCXX_ASSERTIONS option was not seen");
     }