Java: Add constant array lengths to ConstantIntegerExpr.

aschackmull · aschackmull · commit 6dfbb72fc88e · 2018-10-11T11:26:16.000+02:00
diff --git a/java/ql/src/semmle/code/java/dataflow/RangeUtils.qll b/java/ql/src/semmle/code/java/dataflow/RangeUtils.qll
@@ -15,6 +15,13 @@ private predicate constantIntegerExpr(Expr e, int val) {
     src = v.getDefiningExpr().(VariableAssign).getSource() and
     constantIntegerExpr(src, val)
   )
+  or
+  exists(SsaExplicitUpdate v, FieldRead arrlen |
+    e = arrlen and
+    arrlen.getField() instanceof ArrayLengthField and
+    arrlen.getQualifier() = v.getAUse() and
+    v.getDefiningExpr().(VariableAssign).getSource().(ArrayCreationExpr).getFirstDimensionSize() = val
+  )
 }
 
 /** An expression that always has the same integer value. */

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,13 @@ private predicate constantIntegerExpr(Expr e, int val) {`
`15`	`15`	`src = v.getDefiningExpr().(VariableAssign).getSource() and`
`16`	`16`	`constantIntegerExpr(src, val)`
`17`	`17`	`)`
	`18`	`+ or`
	`19`	`+ exists(SsaExplicitUpdate v, FieldRead arrlen \|`
	`20`	`+ e = arrlen and`
	`21`	`+ arrlen.getField() instanceof ArrayLengthField and`
	`22`	`+ arrlen.getQualifier() = v.getAUse() and`
	`23`	`+ v.getDefiningExpr().(VariableAssign).getSource().(ArrayCreationExpr).getFirstDimensionSize() = val`
	`24`	`+ )`
`18`	`25`	`}`
`19`	`26`
`20`	`27`	`/** An expression that always has the same integer value. */`