Fix miscopied isBarrier in JndiInjectionQuery

egregius313 · egregius313 · commit 17cdd16c19fe · 2023-03-29T07:23:13.000-04:00
diff --git a/java/ql/lib/semmle/code/java/security/JndiInjectionQuery.qll b/java/ql/lib/semmle/code/java/security/JndiInjectionQuery.qll
@@ -38,7 +38,9 @@ module JndiInjectionFlowConfig implements DataFlow::ConfigSig {
   predicate isSink(DataFlow::Node sink) { sink instanceof JndiInjectionSink }
 
   predicate isBarrier(DataFlow::Node node) {
-    node.getType() instanceof PrimitiveType or node.getType() instanceof BoxedType
+    node.getType() instanceof PrimitiveType or
+    node.getType() instanceof BoxedType or
+    node instanceof JndiInjectionSanitizer
   }
 
   predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,9 @@ module JndiInjectionFlowConfig implements DataFlow::ConfigSig {`
`38`	`38`	`predicate isSink(DataFlow::Node sink) { sink instanceof JndiInjectionSink }`
`39`	`39`
`40`	`40`	`predicate isBarrier(DataFlow::Node node) {`
`41`		`- node.getType() instanceof PrimitiveType or node.getType() instanceof BoxedType`
	`41`	`+ node.getType() instanceof PrimitiveType or`
	`42`	`+ node.getType() instanceof BoxedType or`
	`43`	`+ node instanceof JndiInjectionSanitizer`
`42`	`44`	`}`
`43`	`45`
`44`	`46`	`predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {`