From b256ea2f1ec639036b9e4f436e12c5dd7fe97164 Mon Sep 17 00:00:00 2001 From: pr0me Date: Mon, 4 Mar 2024 17:10:02 +0100 Subject: [PATCH 1/3] fix broken JAVA patterns --- JAVA/24_arraylist/24_arraylist.json | 4 +++- .../26_assign_object1_to_object2.json | 3 +-- JAVA/32_cloneable/32_cloneable.json | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/JAVA/24_arraylist/24_arraylist.json b/JAVA/24_arraylist/24_arraylist.json index 5a07cc2..c0a8dc2 100644 --- a/JAVA/24_arraylist/24_arraylist.json +++ b/JAVA/24_arraylist/24_arraylist.json @@ -7,7 +7,9 @@ "java" ], "instances": [ - "./24_arraylist_rule.sc" + "./1_instance_24_arraylist/1_instance_24_arraylist.json", + "./2_instance_24_arraylist/2_instance_24_arraylist.json", + "./3_instance_24_arraylist/3_instance_24_arraylist.json" ], "version": "v0.draft" } \ No newline at end of file diff --git a/JAVA/26_assign_object1_to_object2/26_assign_object1_to_object2.json b/JAVA/26_assign_object1_to_object2/26_assign_object1_to_object2.json index cb8915e..4e0aff0 100644 --- a/JAVA/26_assign_object1_to_object2/26_assign_object1_to_object2.json +++ b/JAVA/26_assign_object1_to_object2/26_assign_object1_to_object2.json @@ -7,8 +7,7 @@ "java" ], "instances": [ - "./1_instance_26_assign_object1_to_object2/1_instance_26_assign_object1_to_object2.json", - "./2_instance_26_assign_object1_to_object2/2_instance_26_assign_object1_to_object2.json" + "./1_instance_26_assign_object1_to_object2/1_instance_26_assign_object1_to_object2.json" ], "version": "v1.0" } \ No newline at end of file diff --git a/JAVA/32_cloneable/32_cloneable.json b/JAVA/32_cloneable/32_cloneable.json index a8cc33c..cf034d1 100644 --- a/JAVA/32_cloneable/32_cloneable.json +++ b/JAVA/32_cloneable/32_cloneable.json @@ -7,7 +7,8 @@ "java" ], "instances": [ - "./32_cloneable_rule.sc" + "./1_instance_32_cloneable/1_instance_32_cloneable.json", + "./2_instance_32_cloneable/2_instance_32_cloneable.json" ], "version": "v1.0" } \ No newline at end of file From e4eb96529e4a2923d59c49357764ff3df1ef4ab4 Mon Sep 17 00:00:00 2001 From: pr0me Date: Thu, 14 Mar 2024 14:36:47 +0100 Subject: [PATCH 2/3] fix 1_instance_26 --- .../1_instance_26_assign_object1_to_object2.sc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/JAVA/26_assign_object1_to_object2/1_instance_26_assign_object1_to_object2/1_instance_26_assign_object1_to_object2.sc b/JAVA/26_assign_object1_to_object2/1_instance_26_assign_object1_to_object2/1_instance_26_assign_object1_to_object2.sc index eb9e747..2864c82 100644 --- a/JAVA/26_assign_object1_to_object2/1_instance_26_assign_object1_to_object2/1_instance_26_assign_object1_to_object2.sc +++ b/JAVA/26_assign_object1_to_object2/1_instance_26_assign_object1_to_object2/1_instance_26_assign_object1_to_object2.sc @@ -1,6 +1,6 @@ @main def main(name : String): Unit = { importCpg(name) - val x1 = (name,"1_instance_26_assign_object1_to_object2_iall",cpg.typeDecl.flatMap(x => cpg.call.methodFullName(".*assign.*").filter(_.typeFullName == x.name).whereNot(_.code(".* new .*"))).location.toJson); + val x1 = (name,"1_instance_26_assign_object1_to_object2_iall",cpg.typeDecl.flatMap(x => cpg.call.methodFullName(".*assign.*").filter(_.typeFullName == x.fullName).whereNot(_.code(".* new .*"))).location.toJson); println(x1); delete; } From 52f952f2128ea2805180fda57e145b3845bd29fa Mon Sep 17 00:00:00 2001 From: pr0me Date: Thu, 14 Mar 2024 15:01:05 +0100 Subject: [PATCH 3/3] reduce false positives in 1_instance_26 --- .../1_instance_26_assign_object1_to_object2.sc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/JAVA/26_assign_object1_to_object2/1_instance_26_assign_object1_to_object2/1_instance_26_assign_object1_to_object2.sc b/JAVA/26_assign_object1_to_object2/1_instance_26_assign_object1_to_object2/1_instance_26_assign_object1_to_object2.sc index 2864c82..e4cf896 100644 --- a/JAVA/26_assign_object1_to_object2/1_instance_26_assign_object1_to_object2/1_instance_26_assign_object1_to_object2.sc +++ b/JAVA/26_assign_object1_to_object2/1_instance_26_assign_object1_to_object2/1_instance_26_assign_object1_to_object2.sc @@ -1,6 +1,6 @@ @main def main(name : String): Unit = { importCpg(name) - val x1 = (name,"1_instance_26_assign_object1_to_object2_iall",cpg.typeDecl.flatMap(x => cpg.call.methodFullName(".*assign.*").filter(_.typeFullName == x.fullName).whereNot(_.code(".* new .*"))).location.toJson); + val x1 = (name,"1_instance_26_assign_object1_to_object2_iall",cpg.typeDecl.flatMap(x => cpg.call.methodFullName(".*assign.*").filter(x.fullName != "" && x.fullName != "ANY" && _.typeFullName == x.fullName).whereNot(_.code(".* new .*"))).location.toJson); println(x1); delete; }