gh-145040: Fix close_attempted_in_callback flag consumed by nested callbacks

Only check and consume the close_attempted_in_callback flag when
in_callback reaches zero (the outermost level). Previously, a nested
stmt_step() inside a callback could consume the flag, causing the
outermost caller to miss the error.

Author: raminfp

Lib/test/test_sqlite3/test_userfunctions.py

@@ -797,6 +797,33 @@ def inner_func(x):
         self.assertEqual(con.execute("SELECT 1").fetchone(), (1,))
         con.close()
 
+    def test_close_conn_in_nested_callback_caught(self):
+        # gh-145040: close attempt must propagate even if the exception
+        # is caught inside the callback and a nested execute consumes
+        # the flag.
+        con = sqlite.connect(":memory:", autocommit=True)
+        con.execute("CREATE TABLE t(x INTEGER)")
+        con.execute("INSERT INTO t VALUES(1)")
+
+        def swallow_close(x):
+            try:
+                con.close()
+            except sqlite.ProgrammingError:
+                pass
+            try:
+                con.execute("SELECT 1")
+            except sqlite.ProgrammingError:
+                pass
+            return x
+
+        con.create_function("swallow_close", 1, swallow_close)
+        msg = "from within a callback"
+        with self.assertRaisesRegex(sqlite.ProgrammingError, msg):
+            con.execute("SELECT swallow_close(x) FROM t")
+        # Connection must still be usable.
+        self.assertEqual(con.execute("SELECT 1").fetchone(), (1,))
+        con.close()
+
     def test_close_conn_in_udf_during_executemany(self):
         # gh-145040: closing connection in UDF during executemany.
         con = sqlite.connect(":memory:", autocommit=True)

Modules/_sqlite/cursor.c

@@ -908,7 +908,9 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
         self->connection->in_callback++;
         rc = stmt_step(self->statement->st);
         self->connection->in_callback--;
-        if (self->connection->close_attempted_in_callback) {
+        if (self->connection->close_attempted_in_callback
+            && self->connection->in_callback == 0)
+        {
             self->connection->close_attempted_in_callback = 0;
             PyErr_Clear();
             PyErr_SetString(state->ProgrammingError,
@@ -1168,7 +1170,9 @@ pysqlite_cursor_iternext(PyObject *op)
     self->connection->in_callback++;
     int rc = stmt_step(stmt);
     self->connection->in_callback--;
-    if (self->connection->close_attempted_in_callback) {
+    if (self->connection->close_attempted_in_callback
+        && self->connection->in_callback == 0)
+    {
         self->connection->close_attempted_in_callback = 0;
         Py_DECREF(row);
         Py_CLEAR(self->statement);