Merge pull request #11299 from tamasvajk/kotlin-nested-serializable

Kotlin: Exclude .kt files from serializable inner class query

Author: tamasvajk

java/ql/src/Likely Bugs/Serialization/NonSerializableInnerClass.ql

@@ -77,7 +77,7 @@ predicate exceptions(NestedClass inner) {
 
 from NestedClass inner, Class outer, string advice
 where
-  inner.fromSource() and
+  inner.getFile().isJavaSourceFile() and
   isSerializable(inner) and
   outer = enclosingInstanceType+(inner) and
   not isSerializable(outer) and

java/ql/test/kotlin/query-tests/NonSerializableInnerClass/NonSerializableInnerClass.expected

@@ -0,0 +1 @@
+Likely Bugs/Serialization/NonSerializableInnerClass.ql

java/ql/test/kotlin/query-tests/NonSerializableInnerClass/NonSerializableInnerClass.qlref

@@ -0,0 +1,11 @@
+import java.io.Serializable
+
+class A {
+  class X : Serializable {
+  }
+}
+
+class B {
+  inner class X : Serializable {
+  }
+}