From c930f286439efc7193dcc0955fc96feee77d85f2 Mon Sep 17 00:00:00 2001
From: Jussi Saurio <jussi.saurio@gmail.com>
Date: Tue, 9 Sep 2025 00:00:19 +0300
Subject: [PATCH] Handle case where null flag is set in op_column

---
 core/vdbe/execute.rs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/vdbe/execute.rs b/core/vdbe/execute.rs
index 0c6db224d..bc7cb3f99 100644
--- a/core/vdbe/execute.rs
+++ b/core/vdbe/execute.rs
@@ -1455,13 +1455,16 @@ pub fn op_column(
                 index_cursor_id,
                 table_cursor_id,
             } => {
-                let rowid = {
+                let Some(rowid) = ({
                     let index_cursor = state.get_cursor(index_cursor_id);
                     let index_cursor = index_cursor.as_btree_mut();
                     return_if_io!(index_cursor.rowid())
+                }) else {
+                    state.registers[*dest] = Register::Value(Value::Null);
+                    break 'outer;
                 };
                 state.op_column_state = OpColumnState::Seek {
-                    rowid: rowid.unwrap(),
+                    rowid,
                     table_cursor_id,
                 };
             }