CodeQL: Fix _ATOM handling in non-term-to-term-func

bettio · bettio · commit 9967102086c3 · 2024-12-27T14:48:41.000+01:00
Now _ATOM constants are implemented using enums, so make sure that they
are not reported as invalid since they are safe by design.

Signed-off-by: Davide Bettio &lt;davide@uninstall.it&gt;
diff --git a/code-queries/non-term-to-term-func.ql b/code-queries/non-term-to-term-func.ql
@@ -34,6 +34,10 @@ predicate isNotTermOrAtom(Expr expr) {
       (mi.toString().matches("%_ATOM") or mi.toString().matches("TERM_%"))
     )
   ) and
+  not (
+    expr instanceof EnumConstantAccess and
+    expr.(EnumConstantAccess).getTarget().toString().matches("%_ATOM")
+  ) and
   (
     not expr instanceof ConditionalExpr
     or

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,10 @@ predicate isNotTermOrAtom(Expr expr) {`
`34`	`34`	`(mi.toString().matches("%_ATOM") or mi.toString().matches("TERM_%"))`
`35`	`35`	`)`
`36`	`36`	`) and`
	`37`	`+ not (`
	`38`	`+ expr instanceof EnumConstantAccess and`
	`39`	`+ expr.(EnumConstantAccess).getTarget().toString().matches("%_ATOM")`
	`40`	`+ ) and`
`37`	`41`	`(`
`38`	`42`	`not expr instanceof ConditionalExpr`
`39`	`43`	`or`