Merge pull request github#11286 from tamasvajk/kotlin-resource-leak

Kotlin: Exclude .kt files from resource leak queries

Author: tamasvajk

java/ql/src/Likely Bugs/Resource Leaks/CloseReader.ql

@@ -33,6 +33,7 @@ predicate safeReaderType(RefType t) {
 
 from ClassInstanceExpr cie, RefType t
 where
+  cie.getFile().isJavaSourceFile() and
   badCloseableInit(cie) and
   cie.getType() = t and
   readerType(t) and

java/ql/src/Likely Bugs/Resource Leaks/CloseSql.ql

@@ -15,6 +15,7 @@ import CloseType
 
 from CloseableInitExpr cie, RefType t
 where
+  cie.getFile().isJavaSourceFile() and
   badCloseableInit(cie) and
   cie.getType() = t and
   sqlType(t) and

java/ql/src/Likely Bugs/Resource Leaks/CloseWriter.ql

@@ -29,6 +29,7 @@ predicate safeWriterType(RefType t) {
 
 from ClassInstanceExpr cie, RefType t
 where
+  cie.getFile().isJavaSourceFile() and
   badCloseableInit(cie) and
   cie.getType() = t and
   writerType(t) and

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

@@ -0,0 +1,7 @@
+import java.io.*
+
+fun test0() {
+    BufferedReader(FileReader("C:\\test.txt")).use { bw ->
+        bw.readLine()
+    }
+}

java/ql/test/kotlin/query-tests/CloseReader/CloseReader.kt

@@ -0,0 +1 @@
+Likely Bugs/Resource Leaks/CloseReader.ql

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

@@ -0,0 +1,45 @@
+import java.io.*
+
+fun test0() {
+    val bw = BufferedWriter(FileWriter("C:\\test.txt"))
+    bw.write("test")
+}
+
+fun test1() {
+    BufferedWriter(FileWriter("C:\\test.txt")).use { bw ->
+        bw.write("test")
+    }
+}
+
+fun test2() {
+    val bw = FileOutputStream(File.createTempFile("","")).bufferedWriter()
+    bw.write("test")
+}
+
+fun test3() {
+    FileOutputStream(File.createTempFile("","")).bufferedWriter().use { bw ->
+        bw.write("test")
+    }
+}
+
+fun test4() {
+    val bw = OutputStreamWriter(FileOutputStream(File.createTempFile("",""))).buffered()
+    bw.write("test")
+}
+
+fun test5() {
+    OutputStreamWriter(FileOutputStream(File.createTempFile("",""))).buffered().use { bw ->
+        bw.write("test")
+    }
+}
+
+fun test6() {
+    val bw = OutputStreamWriter(FileOutputStream(File.createTempFile("","")))
+    bw.write("test")
+}
+
+fun test7() {
+    OutputStreamWriter(FileOutputStream(File.createTempFile("",""))).use { bw ->
+        bw.write("test")
+    }
+}

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

@@ -0,0 +1 @@
+Likely Bugs/Resource Leaks/CloseWriter.ql