ATM: fix compiler warnings about unused variables

erik-krogh · erik-krogh · commit 81ce8ac715bb · 2022-04-20T18:10:59.000+02:00
diff --git a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/EndpointScoring.qll b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/EndpointScoring.qll
@@ -118,6 +118,7 @@ class EndpointScoringResults extends ScoringResults {
 
   pragma[inline]
   override predicate shouldResultBeIncluded(DataFlow::Node source, DataFlow::Node sink) {
+    exists(source) and
     if getCfg().isKnownSink(sink)
     then any()
     else (
diff --git a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/TaintedPathATM.qll b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/TaintedPathATM.qll
@@ -125,6 +125,6 @@ class BarrierGuardNodeAsSanitizerGuardNode extends TaintTracking::LabeledSanitiz
   }
 
   override predicate sanitizes(boolean outcome, Expr e, DataFlow::FlowLabel label) {
-    sanitizes(outcome, e)
+    sanitizes(outcome, e) and exists(label)
   }
 }
diff --git a/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/extraction/ExtractEndpointData.qll b/javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/extraction/ExtractEndpointData.qll
@@ -193,7 +193,7 @@ module FlowFromSource {
 
     /** The sinks are the endpoints we're extracting. */
     override predicate isSink(DataFlow::Node sink, DataFlow::FlowLabel lbl) {
-      sink = getAnEndpoint(q)
+      sink = getAnEndpoint(q) and exists(lbl)
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -125,6 +125,6 @@ class BarrierGuardNodeAsSanitizerGuardNode extends TaintTracking::LabeledSanitiz`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`override predicate sanitizes(boolean outcome, Expr e, DataFlow::FlowLabel label) {`
`128`		`- sanitizes(outcome, e)`
	`128`	`+ sanitizes(outcome, e) and exists(label)`
`129`	`129`	`}`
`130`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ module FlowFromSource {`
`193`	`193`
`194`	`194`	`/** The sinks are the endpoints we're extracting. */`
`195`	`195`	`override predicate isSink(DataFlow::Node sink, DataFlow::FlowLabel lbl) {`
`196`		`- sink = getAnEndpoint(q)`
	`196`	`+ sink = getAnEndpoint(q) and exists(lbl)`
`197`	`197`	`}`
`198`	`198`	`}`
`199`	`199`	`}`