Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3903,7 +3903,12 @@ open class KotlinFileExtractor(

val prop =
getPropertiesByFqName(pluginContext, propertyPkg, propertyName)
.firstOrNull { it.owner.parentClassOrNull?.fqNameWhenAvailable?.asString() == type }
.firstOrNull {
val owner = it.owner
owner.parentClassOrNull?.fqNameWhenAvailable?.asString() == type ||
(owner.parent is IrExternalPackageFragment &&
getFileClassFqName(owner)?.asString() == type)
}
?.owner

if (prop != null) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
category: majorAnalysis
---
* Fixed an issue where `Foo::class.java` arguments were dropped during extraction under the Kotlin K2 compiler, which could cause false positives in queries such as `java/android/implicit-pendingintents`.
10 changes: 10 additions & 0 deletions java/ql/test-kotlin2/library-tests/kclass-java-arg/Test.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
class Target

class KClassJavaArg {
fun consume(c: Class<*>) {}

fun test() {
// `Target::class.java` must be extracted as the argument to `consume`.
consume(Target::class.java)
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// codeql-extractor-kotlin-options: -language-version 2.0 -api-version 2.0
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
| consume | Class<Target> |
5 changes: 5 additions & 0 deletions java/ql/test-kotlin2/library-tests/kclass-java-arg/test.ql
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import java

from MethodCall mc, Argument arg
where mc.getMethod().hasName("consume") and arg = mc.getAnArgument()
select mc.getMethod().getName(), arg.getType().getName()
Loading