Skip to content

Commit d82fee1

Browse files
committed
Java: Add data flow for record getters.
1 parent b8d6f76 commit d82fee1

File tree

5 files changed

+60
-0
lines changed

5 files changed

+60
-0
lines changed

java/ql/src/semmle/code/java/dataflow/internal/DataFlowPrivate.qll

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,18 @@ predicate readStep(Node node1, Content f, Node node2) {
193193
fr.getField() = f.(FieldContent).getField() and
194194
fr = node2.asExpr()
195195
)
196+
or
197+
exists(Record r, Method getter, Field recf, MethodAccess get |
198+
getter.getDeclaringType() = r and
199+
recf.getDeclaringType() = r and
200+
getter.getNumberOfParameters() = 0 and
201+
getter.getName() = recf.getName() and
202+
not exists(getter.getBody()) and
203+
recf = f.(FieldContent).getField() and
204+
get.getMethod() = getter and
205+
node1.asExpr() = get.getQualifier() and
206+
node2.asExpr() = get
207+
)
196208
}
197209

198210
/**
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
public class A {
2+
record Pair(Object x, Object y) { }
3+
4+
Object source() { return null; }
5+
6+
void sink(Object o) { }
7+
8+
void foo() {
9+
Pair p1 = new Pair(source(), null);
10+
Pair p2 = new Pair(new Object(), source());
11+
bar(p1, p2);
12+
}
13+
14+
void bar(Pair p1, Pair p2) {
15+
sink(p1.x);
16+
sink(p1.y);
17+
sink(p2.x);
18+
sink(p2.y);
19+
Object p1x = p1.x();
20+
Object p1y = p1.y();
21+
Object p2x = p2.x();
22+
Object p2y = p2.y();
23+
sink(p1x);
24+
sink(p1y);
25+
sink(p2x);
26+
sink(p2y);
27+
}
28+
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
//semmle-extractor-options: --javac-args --enable-preview -source 14 -target 14
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
| A.java:9:24:9:31 | source(...) | A.java:15:10:15:13 | p1.x |
2+
| A.java:9:24:9:31 | source(...) | A.java:23:10:23:12 | p1x |
3+
| A.java:10:38:10:45 | source(...) | A.java:18:10:18:13 | p2.y |
4+
| A.java:10:38:10:45 | source(...) | A.java:26:10:26:12 | p2y |
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import java
2+
import semmle.code.java.dataflow.DataFlow
3+
import DataFlow
4+
5+
class Conf extends Configuration {
6+
Conf() { this = "qqconf" }
7+
8+
override predicate isSource(Node n) { n.asExpr().(MethodAccess).getMethod().hasName("source") }
9+
10+
override predicate isSink(Node n) { n.asExpr().(Argument).getCall().getCallee().hasName("sink") }
11+
}
12+
13+
from Conf conf, Node src, Node sink
14+
where conf.hasFlow(src, sink)
15+
select src, sink

0 commit comments

Comments
 (0)