From e969a42effba74528cb508eba248ea2cab37ae73 Mon Sep 17 00:00:00 2001
From: David Perez <david@livefront.com>
Date: Thu, 19 Mar 2026 15:47:45 -0500
Subject: [PATCH] PM-33909: bug: Check the column index before querying for 3rd
 party autofill data (#6697)

---
 .../browser/BrowserThirdPartyAutofillManagerImpl.kt    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/manager/browser/BrowserThirdPartyAutofillManagerImpl.kt b/app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/manager/browser/BrowserThirdPartyAutofillManagerImpl.kt
index 30d2e26034..9b3ffef5f7 100644
--- a/app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/manager/browser/BrowserThirdPartyAutofillManagerImpl.kt
+++ b/app/src/main/kotlin/com/x8bit/bitwarden/data/autofill/manager/browser/BrowserThirdPartyAutofillManagerImpl.kt
@@ -62,11 +62,13 @@ class BrowserThirdPartyAutofillManagerImpl(
             )
         var thirdPartyEnabled = false
         val isThirdPartyAvailable = cursor
-            ?.let {
+            ?.use {
                 it.moveToFirst()
-                val columnIndex = it.getColumnIndex(THIRD_PARTY_MODE_COLUMN)
-                thirdPartyEnabled = it.getInt(columnIndex) != 0
-                it.close()
+                thirdPartyEnabled = it
+                    .getColumnIndex(THIRD_PARTY_MODE_COLUMN)
+                    .takeUnless { columnIndex -> columnIndex == -1 }
+                    ?.let { columnIndex -> it.getInt(columnIndex) != 0 }
+                    ?: false
                 true
             }
             ?: false