hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-23 12:16:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10313 from tamasvajk/kotlin-fix-vararg

Browse Source 
Kotlin: Fix `vararg` extraction outside of method call
This commit is contained in:
Tamás Vajk
2022-09-12 15:54:50 +02:00
committed by GitHub
parent ed772e54d1 07038d0b3a
commit 4569b9585f
4 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/ql/test/kotlin/library-tests/vararg/args.expected
View File

@@ -1,9 +1,11 @@
diag
varargsParams
| test.kt:8:15:8:28 | xs | file://:0:0:0:0 | int[] |
| test.kt:12:26:12:39 | xs | file://:0:0:0:0 | int[] |
| test.kt:20:24:20:37 | xs | file://:0:0:0:0 | int[] |
| test.kt:24:50:24:63 | xs | file://:0:0:0:0 | int[] |
| test.kt:28:37:28:50 | xs | file://:0:0:0:0 | int[] |
| test.kt:50:5:50:31 | s | file://:0:0:0:0 | String[] |
explicitVarargsArguments
| test.kt:12:50:12:51 | xs | test.kt:12:44:12:52 | this(...) |
| test.kt:38:25:38:29 | array | test.kt:38:5:38:30 | funWithOnlyVarArgs(...) |
@@ -11,6 +13,7 @@ explicitVarargsArguments
| test.kt:40:34:40:38 | array | test.kt:40:5:40:49 | funWithMiddleVarArgs(...) |
| test.kt:44:27:44:31 | array | test.kt:44:5:44:32 | new HasVarargConstructor(...) |
| test.kt:45:34:45:38 | array | test.kt:45:5:45:39 | new HasVarargConstructor(...) |
| test.kt:55:15:55:35 | tmp0_s | test.kt:55:13:55:43 | new X(...) |
implicitVarargsArguments
| intList.kt:3:21:3:22 | 10 | intList.kt:3:14:3:31 | listOf(...) | 0 |
| intList.kt:3:25:3:26 | 11 | intList.kt:3:14:3:31 | listOf(...) | 1 |
@@ -78,3 +81,6 @@ implicitVarargsArguments
| test.kt:44:5:44:32 | new HasVarargConstructor(...) | 0 | test.kt:44:27:44:31 | array |
| test.kt:45:5:45:39 | new HasVarargConstructor(...) | 0 | test.kt:45:27:45:29 | foo |
| test.kt:45:5:45:39 | new HasVarargConstructor(...) | 1 | test.kt:45:34:45:38 | array |
| test.kt:55:13:55:43 | new X(...) | 0 | test.kt:55:42:55:42 | 1 |
| test.kt:55:13:55:43 | new X(...) | 1 | test.kt:55:15:55:35 | tmp0_s |
| test.kt:55:22:55:35 | toTypedArray(...) | 0 | test.kt:55:19:55:20 | sl |

3
java/ql/test/kotlin/library-tests/vararg/args.ql
View File

@@ -1,4 +1,7 @@
import java
import semmle.code.java.Diagnostics
query predicate diag(Diagnostic d) { d.getMessage() = "Unexpected IrVararg" }
query predicate varargsParams(Parameter p, Type t) {
p.getCallable().fromSource() and

12
java/ql/test/kotlin/library-tests/vararg/test.kt
View File

@@ -1,6 +1,6 @@
fun sink(sunk: Int) {
}
open class HasVarargConstructor {
@@ -44,3 +44,13 @@ fun myFun() {
HasVarargConstructor(*array)
HasVarargConstructor("foo", *array)
}
open class X(
i: Int,
public vararg val s: String
) { }
fun fn(sl: List<String>) {
// reordered args:
val x = X(s = sl.toTypedArray(), i = 1)
}