Java: Bugfix in TypeFlow.

aschackmull · aschackmull · commit fc415b32c208 · 2022-08-29T13:50:13.000+02:00
diff --git a/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll b/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll
@@ -220,7 +220,7 @@ private predicate upcastCand(TypeFlowNode n, RefType t, RefType t1, RefType t2)
       ret.getResult() = n.asExpr() and t2 = ret.getEnclosingCallable().getReturnType().getErasure()
     )
     or
-    exists(MethodAccess ma | viableImpl_v1(ma) = n.asMethod() and t2 = ma.getType())
+    exists(MethodAccess ma | viableImpl_v1(ma) = n.asMethod() and t2 = ma.getType().getErasure())
     or
     exists(Parameter p | privateParamArg(p, n.asExpr()) and t2 = p.getType().getErasure())
     or

Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ private predicate upcastCand(TypeFlowNode n, RefType t, RefType t1, RefType t2)`
`220`	`220`	`ret.getResult() = n.asExpr() and t2 = ret.getEnclosingCallable().getReturnType().getErasure()`
`221`	`221`	`)`
`222`	`222`	`or`
`223`		`- exists(MethodAccess ma \| viableImpl_v1(ma) = n.asMethod() and t2 = ma.getType())`
	`223`	`+ exists(MethodAccess ma \| viableImpl_v1(ma) = n.asMethod() and t2 = ma.getType().getErasure())`
`224`	`224`	`or`
`225`	`225`	`exists(Parameter p \| privateParamArg(p, n.asExpr()) and t2 = p.getType().getErasure())`
`226`	`226`	`or`