Fix bug to accept bulk data for char/byte arrays

Benjamin Muskalla · Benjamin Muskalla · commit 83b4070f31f8 · 2021-11-10T16:30:23.000+01:00
diff --git a/java/ql/src/utils/model-generator/CaptureSummaryModels.ql b/java/ql/src/utils/model-generator/CaptureSummaryModels.ql
@@ -129,8 +129,10 @@ predicate isRelevantType(Type t) {
   not t instanceof PrimitiveType and
   not t instanceof BoxedType and
   not t.(RefType).hasQualifiedName("java.math", "BigInteger") and
-  not t.(Array).getElementType() instanceof PrimitiveType and
-  not t.(Array).getElementType().(PrimitiveType).getName().regexpMatch("byte|char") and
+  (
+    not t.(Array).getElementType() instanceof PrimitiveType or
+    t.(Array).getElementType().(PrimitiveType).getName().regexpMatch("byte|char")
+  ) and
   not t.(Array).getElementType() instanceof BoxedType and
   not t.(CollectionType).getElementType() instanceof BoxedType
 }
diff --git a/java/ql/test/utils/model-generator/CaptureSummaryModels.expected b/java/ql/test/utils/model-generator/CaptureSummaryModels.expected
@@ -32,5 +32,7 @@
 | p;ParamFlow;true;returnsInput;(String);;Argument[0];ReturnValue;taint; |
 | p;ParamFlow;true;writeChunked;(byte[],OutputStream);;ArrayElement of Argument[0];Argument[1];taint; |
 | p;Pojo;false;fillIn;(List);;Argument[-1];Element of Argument[0];taint; |
+| p;Pojo;false;getByteArray;();;Argument[-1];ReturnValue;taint; |
+| p;Pojo;false;getCharArray;();;Argument[-1];ReturnValue;taint; |
 | p;Pojo;false;getValue;();;Argument[-1];ReturnValue;taint; |
 | p;Pojo;false;setValue;(String);;Argument[0];Argument[-1];taint; |
diff --git a/java/ql/test/utils/model-generator/p/Pojo.java b/java/ql/test/utils/model-generator/p/Pojo.java
@@ -48,13 +48,17 @@ public int[] getPrimitiveArray() {
     }
 
     public char[] getCharArray() {
-        return Character.toChars(intValue);
+        return new char[] { (char) intValue };
     }
 
     public byte[] getByteArray() {
         return new byte[] { (byte) intValue };
     }
     
+    public float[] getFloatArray() {
+        return new float[] { (float) intValue };
+    }
+
     public Integer[] getBoxedArray() {
         return new Integer[] { Integer.valueOf(intValue) };
     }

Original file line number	Diff line number	Diff line change
`@@ -48,13 +48,17 @@ public int[] getPrimitiveArray() {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`public char[] getCharArray() {`
`51`		`- return Character.toChars(intValue);`
	`51`	`+ return new char[] { (char) intValue };`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`public byte[] getByteArray() {`
`55`	`55`	`return new byte[] { (byte) intValue };`
`56`	`56`	`}`
`57`	`57`
	`58`	`+ public float[] getFloatArray() {`
	`59`	`+ return new float[] { (float) intValue };`
	`60`	`+ }`
	`61`	`+`
`58`	`62`	`public Integer[] getBoxedArray() {`
`59`	`63`	`return new Integer[] { Integer.valueOf(intValue) };`
`60`	`64`	`}`