Merge pull request #15265 from github/redsun82/def-to-non-header-incl…

…ude-exceptions C++: add `.def` to exceptions to AV rule 32
github · Jan 11, 2024 · 482b5f3 · 482b5f3
2 parents 51fe477 + 27160b8
commit 482b5f3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/cpp/ql/src/change-notes/2024-01-09-add-exception-to-av-rule-32.md b/cpp/ql/src/change-notes/2024-01-09-add-exception-to-av-rule-32.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* The `cpp/include-non-header` style query will now ignore the `.def` extension for textual header inclusions.
diff --git a/cpp/ql/src/jsf/4.06 Pre-Processing Directives/AV Rule 32.ql b/cpp/ql/src/jsf/4.06 Pre-Processing Directives/AV Rule 32.ql
@@ -18,6 +18,7 @@ from Include i, File f, string extension
 where
   f = i.getIncludedFile() and
   extension = f.getExtension().toLowerCase() and
+  extension != "def" and
   extension != "inc" and
   extension != "inl" and
   extension != "tcc" and

diff --git a/cpp/ql/test/query-tests/jsf/4.06 Pre-Processing Directives/AV Rule 32/test.c b/cpp/ql/test/query-tests/jsf/4.06 Pre-Processing Directives/AV Rule 32/test.c
@@ -1,3 +1,4 @@
-#include "test.H"
-#include "test.xpm"
-#include "test2.c"
+#include "test.H"    // GOOD
+#include "test.xpm"  // GOOD
+#include "test2.c"   // BAD
+#include "test.def"  // GOOD
diff --git a/cpp/ql/test/query-tests/jsf/4.06 Pre-Processing Directives/AV Rule 32/test.def b/cpp/ql/test/query-tests/jsf/4.06 Pre-Processing Directives/AV Rule 32/test.def