fix bug

kanaksad · Dec 20, 2024 · e9d4fe5 · e9d4fe5
1 parent 07ed77a
commit e9d4fe5
Show file tree

Hide file tree

Showing 12 changed files with 62 additions and 3 deletions.
diff --git a/src/main/java/edu/ucr/cs/riple/taint/ucrtainting/serialization/visitors/FixComputer.java b/src/main/java/edu/ucr/cs/riple/taint/ucrtainting/serialization/visitors/FixComputer.java
@@ -149,7 +149,8 @@ public Set<Fix> visitMethodInvocation(MethodInvocationTree node, FoundRequired p
         return answer(polyFixes);
       }
     }
-    if (CollectionHandler.isGenericToArrayMethod(calledMethod, types) || CollectionHandler.isToArrayMethod(calledMethod, types)) {
+    if (CollectionHandler.isGenericToArrayMethod(calledMethod, types)
+        || CollectionHandler.isToArrayMethod(calledMethod, types)) {
       return answer(node.accept(collectionFixVisitor, pair));
     }
     if (isGenericMethod) {

diff --git a/...va/edu/ucr/cs/riple/taint/ucrtainting/serialization/visitors/GenericMethodFixVisitor.java b/...va/edu/ucr/cs/riple/taint/ucrtainting/serialization/visitors/GenericMethodFixVisitor.java
@@ -72,8 +72,12 @@ public Set<Fix> visitMethodInvocation(MethodInvocationTree node, FoundRequired p
       for (Type.TypeVar typeVar : effectiveTypes) {
         for (int i = 0; i < node.getArguments().size(); i++) {
           AnnotatedTypeMirror requiredParam = paramsAnnotatedTypeMirrors.get(i).deepCopy(true);
+          requiredParam =
+              (requiredParam instanceof AnnotatedTypeMirror.AnnotatedArrayType)
+                  ? ((AnnotatedTypeMirror.AnnotatedArrayType) requiredParam).getComponentType()
+                  : requiredParam;
           Type paramType =
-              calledMethod.isVarArgs()
+              (calledMethod.isVarArgs() && i == node.getArguments().size() - 1)
                   ? ((Type.ArrayType) calledMethod.getParameters().get(0).type).getComponentType()
                   : calledMethod.getParameters().get(i).type;
           boolean changed = updateAnnotatedTypeMirror(requiredParam, paramType, typeVar);

diff --git a/tests/collectionhandling/expected-output.json b/tests/collectionhandling/expected-output.json
@@ -27,6 +27,49 @@
           }
         }
       ]
+    },
+    {
+      "path": "/home/nima/Developer/git/UCRTaintingChecker/tests/collectionhandling/foo/bar/Foo.java",
+      "messageKey": "assignment",
+      "offset": 937,
+      "index": 2,
+      "region": {
+        "symbol": "arraysAsListGenericTest()",
+        "class": "foo.bar.Foo"
+      },
+      "fixes": [
+        {
+          "annotation": "untainted",
+          "location": {
+            "path": "/home/nima/Developer/git/UCRTaintingChecker/tests/collectionhandling/foo/bar/Foo.java",
+            "varName": "array",
+            "type-variable-position": [
+              [
+                0
+              ]
+            ],
+            "method": "arraysAsListGenericTest()",
+            "kind": "LOCAL_VARIABLE",
+            "class": "foo.bar.Foo"
+          }
+        },
+        {
+          "annotation": "untainted",
+          "location": {
+            "path": "/home/nima/Developer/git/UCRTaintingChecker/tests/collectionhandling/foo/bar/Foo.java",
+            "varName": "c1",
+            "type-variable-position": [
+              [
+                1,
+                0
+              ]
+            ],
+            "method": "arraysAsListGenericTest()",
+            "kind": "LOCAL_VARIABLE",
+            "class": "foo.bar.Foo"
+          }
+        }
+      ]
     }
   ]
 }
diff --git a/tests/collectionhandling/foo/bar/Foo.java b/tests/collectionhandling/foo/bar/Foo.java
@@ -2,9 +2,9 @@
 
 import edu.ucr.cs.riple.taint.ucrtainting.qual.*;
 import java.util.ArrayList;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.LinkedList;
 
 public class Foo {
 
@@ -24,4 +24,12 @@ void refraingFromApplyingUnannotatedCodeHandlerForToArrayMethod() {
     // :: error: assignment
     @RUntainted Object[] array = c1.toArray();
   }
+
+  void arraysAsListGenericTest() {
+    LinkedList<String> c1 = new LinkedList<>();
+    c1.addFirst("x");
+    Object[] array = c1.toArray();
+    // :: error: assignment
+    List<@RUntainted Object> c2 = java.util.Arrays.asList(array);
+  }
 }
diff --git a/tests/templatetest/foo/bar/Test.java b/tests/templatetest/foo/bar/Test.java
@@ -1,6 +1,7 @@
 package foo.bar;
 
 import edu.ucr.cs.riple.taint.ucrtainting.qual.*;
+import java.io.*;
 import java.lang.annotation.*;
 import java.util.*;
 import javax.servlet.http.*;

diff --git a/thirdparty/bin/main/org/thirdparty/Foo.class b/thirdparty/bin/main/org/thirdparty/Foo.class
diff --git a/ucrtainting-checker-qual/bin/main/edu/ucr/cs/riple/taint/ucrtainting/qual/README b/ucrtainting-checker-qual/bin/main/edu/ucr/cs/riple/taint/ucrtainting/qual/README
@@ -0,0 +1,2 @@
+The "qual" directory contains a typechecker's type qualifiers, which are
+represented by Java annotations.
diff --git a/ucrtainting-checker-qual/bin/main/edu/ucr/cs/riple/taint/ucrtainting/qual/RPolyTainted.class b/ucrtainting-checker-qual/bin/main/edu/ucr/cs/riple/taint/ucrtainting/qual/RPolyTainted.class
diff --git a/...ng-checker-qual/bin/main/edu/ucr/cs/riple/taint/ucrtainting/qual/RPossiblyValidated.class b/...ng-checker-qual/bin/main/edu/ucr/cs/riple/taint/ucrtainting/qual/RPossiblyValidated.class
diff --git a/ucrtainting-checker-qual/bin/main/edu/ucr/cs/riple/taint/ucrtainting/qual/RTainted.class b/ucrtainting-checker-qual/bin/main/edu/ucr/cs/riple/taint/ucrtainting/qual/RTainted.class
diff --git a/ucrtainting-checker-qual/bin/main/edu/ucr/cs/riple/taint/ucrtainting/qual/RThis.class b/ucrtainting-checker-qual/bin/main/edu/ucr/cs/riple/taint/ucrtainting/qual/RThis.class
diff --git a/ucrtainting-checker-qual/bin/main/edu/ucr/cs/riple/taint/ucrtainting/qual/RUntainted.class b/ucrtainting-checker-qual/bin/main/edu/ucr/cs/riple/taint/ucrtainting/qual/RUntainted.class
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		The "qual" directory contains a typechecker's type qualifiers, which are
		represented by Java annotations.