JS: Fix whitelisting in UselessConditional

asgerf · asgerf · commit 430bf2da8ad5 · 2020-05-18T22:45:56.000+01:00
diff --git a/javascript/ql/src/Statements/UselessConditional.ql b/javascript/ql/src/Statements/UselessConditional.ql
@@ -62,6 +62,14 @@ predicate isInitialParameterUse(Expr e) {
     not p.isRestParameter()
   )
   or
+  // same as above, but for captured variables
+  exists(SimpleParameter p, LocalVariable var |
+    var = p.getVariable() and
+    var.isCaptured() and
+    e = var.getAnAccess() and
+    not p.isRestParameter()
+  )
+  or
   isInitialParameterUse(e.(LogNotExpr).getOperand())
 }
 
diff --git a/javascript/ql/test/query-tests/Statements/UselessConditional/UselessConditional.js b/javascript/ql/test/query-tests/Statements/UselessConditional/UselessConditional.js
@@ -79,7 +79,7 @@ async function awaitFlow(){
 
     function f3(x) {
         (function(){
-            x || y // NOT OK
+            x || y // NOT OK, but whitelisted
         });
     }
     f3(true);

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,14 @@ predicate isInitialParameterUse(Expr e) {`
`62`	`62`	`not p.isRestParameter()`
`63`	`63`	`)`
`64`	`64`	`or`
	`65`	`+ // same as above, but for captured variables`
	`66`	`+ exists(SimpleParameter p, LocalVariable var \|`
	`67`	`+ var = p.getVariable() and`
	`68`	`+ var.isCaptured() and`
	`69`	`+ e = var.getAnAccess() and`
	`70`	`+ not p.isRestParameter()`
	`71`	`+ )`
	`72`	`+ or`
`65`	`73`	`isInitialParameterUse(e.(LogNotExpr).getOperand())`
`66`	`74`	`}`
`67`	`75`