Value-preserving methods: handle generics in DataFlowUtil.qll

smowton · aschackmull · web-flow · commit a37b98ca27ff · 2021-03-05T13:15:06.000Z
Co-authored-by: Anders Schack-Mulligen &lt;aschackmull@users.noreply.github.com&gt;
diff --git a/java/ql/src/semmle/code/java/dataflow/FlowSteps.qll b/java/ql/src/semmle/code/java/dataflow/FlowSteps.qll
@@ -64,7 +64,6 @@ private class StandardLibraryValuePreservingCallable extends ValuePreservingCall
     )
     or
     this.getDeclaringType()
-        .getSourceDeclaration()
         .getASourceSupertype*()
         .hasQualifiedName("java.util", "Stack") and
     this.hasName("push") and
diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowUtil.qll b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowUtil.qll
@@ -410,7 +410,7 @@ predicate simpleLocalFlowStep(Node node1, Node node2) {
   summaryStep(node1, node2, "value")
   or
   exists(MethodAccess ma, ValuePreservingCallable c, int argNo |
-    ma.getCallee() = c and c.returnsValue(argNo)
+    ma.getCallee().getSourceDeclaration() = c and c.returnsValue(argNo)
   |
     node2.asExpr() = ma and
     (

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,6 @@ private class StandardLibraryValuePreservingCallable extends ValuePreservingCall`
`64`	`64`	`)`
`65`	`65`	`or`
`66`	`66`	`this.getDeclaringType()`
`67`		`- .getSourceDeclaration()`
`68`	`67`	`.getASourceSupertype*()`
`69`	`68`	`.hasQualifiedName("java.util", "Stack") and`
`70`	`69`	`this.hasName("push") and`
Original file line number	Diff line number	Diff line change
`@@ -410,7 +410,7 @@ predicate simpleLocalFlowStep(Node node1, Node node2) {`
`410`	`410`	`summaryStep(node1, node2, "value")`
`411`	`411`	`or`
`412`	`412`	`exists(MethodAccess ma, ValuePreservingCallable c, int argNo \|`
`413`		`- ma.getCallee() = c and c.returnsValue(argNo)`
	`413`	`+ ma.getCallee().getSourceDeclaration() = c and c.returnsValue(argNo)`
`414`	`414`	`\|`
`415`	`415`	`node2.asExpr() = ma and`
`416`	`416`	`(`