commit d1a00f7572a43bde583a2f16e3ce861bac378674
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jul 13 13:42:10 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 13 13:42:10 2023 +0000
tree 2624963ca9bae60881fc72eb5e3246c5b6856359
parent 36f829f2934ffa112cabc43e2c9d008cdbd3e4d0
parent b9c66ea33f8c6683da14a1dbfca4ff412602d16a

Merge "Resolving potential memory leak vulnerability in QueryInterceptorStatement." into androidx-main

room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/QueryInterceptorTest.kt

diff --git a/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/QueryInterceptorTest.kt b/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/QueryInterceptorTest.kt
index 2808373..9fb9cc8 100644
--- a/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/QueryInterceptorTest.kt
+++ b/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/QueryInterceptorTest.kt
@@ -51,7 +51,7 @@
     var queryAndArgs = CopyOnWriteArrayList<Pair<String, ArrayList<Any?>>>()
 
     @Entity(tableName = "queryInterceptorTestDatabase")
-    data class QueryInterceptorEntity(@PrimaryKey val id: String, val description: String)
+    data class QueryInterceptorEntity(@PrimaryKey val id: String, val description: String?)
 
     @Dao
     interface QueryInterceptorDao {
@@ -197,6 +197,23 @@
     }
 
     @Test
+    fun testNullBindArgumentCompileStatement() {
+        val sql = "INSERT OR ABORT INTO `queryInterceptorTestDatabase` (`id`,`description`) " +
+            "VALUES (?,?)"
+        val statement = mDatabase.openHelper.writableDatabase.compileStatement(sql)
+        statement.bindString(1, "ID")
+        statement.bindNull(2)
+        statement.execute()
+
+        val filteredQueries = queryAndArgs.filter { (query, _) -> query == sql }
+
+        assertThat(filteredQueries).hasSize(1)
+        assertThat(filteredQueries[0].second).hasSize(2)
+        assertThat(filteredQueries[0].second[0]).isEqualTo("ID")
+        assertThat(filteredQueries[0].second[1]).isEqualTo(null)
+    }
+
+    @Test
     fun testCallbackCalledOnceAfterCloseAndReOpen() {
         val dbBuilder = Room.inMemoryDatabaseBuilder(
             ApplicationProvider.getApplicationContext(),

room/room-runtime/src/main/java/androidx/room/QueryInterceptorStatement.kt

diff --git a/room/room-runtime/src/main/java/androidx/room/QueryInterceptorStatement.kt b/room/room-runtime/src/main/java/androidx/room/QueryInterceptorStatement.kt
index 50cf02c..37eca34 100644
--- a/room/room-runtime/src/main/java/androidx/room/QueryInterceptorStatement.kt
+++ b/room/room-runtime/src/main/java/androidx/room/QueryInterceptorStatement.kt
@@ -67,7 +67,7 @@
     }
 
     override fun bindNull(index: Int) {
-        saveArgsToCache(index, arrayOf(*bindArgsCache.toTypedArray()))
+        saveArgsToCache(index, null)
         delegate.bindNull(index)
     }