Commit f0eb690cf1d for nodejs
commit f0eb690cf1dc7f6fc3a0fe8f8165a1a1bfa516f5
Author: Guilherme Araújo <arauujogui@gmail.com>
Date: Thu Nov 19 16:24:27 2026 -0300
sqlite: avoid resetting a finalized statement
run() and get() reset a cached statement pointer on exit. Throwing an
error can run an Error.prototype setter that closes the database and
frees it. Reset through the Statement, which Finalize() clears.
Assisted-by: Claude Code
Signed-off-by: Guilherme Araújo <arauujogui@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/67557
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Christian Aurich Zanettini Martins <christian.aurichzm@gmail.com>
diff --git a/src/node_sqlite.cc b/src/node_sqlite.cc
index 74fa2a55fe0..3b59007a1ce 100644
--- a/src/node_sqlite.cc
+++ b/src/node_sqlite.cc
@@ -3835,9 +3835,10 @@ MaybeLocal<Object> StatementExecutionHelper::Run(Environment* env,
// Declared before the reset below so that it outlives it: sqlite3_reset()
// can run JavaScript through an aggregate's xFinal.
SteppingStatementGuard stepping(db, stmt);
+ // Throwing can run JS that closes the database and frees `stmt`.
bool needs_reset = true;
auto reset = OnScopeLeave([&]() {
- if (needs_reset) sqlite3_reset(stmt);
+ if (needs_reset) sqlite3_reset(statement->statement_.get());
});
int step_r = sqlite3_step(stmt);
@@ -3923,9 +3924,10 @@ MaybeLocal<Value> StatementExecutionHelper::Get(Environment* env,
// Declared before the reset below so that it outlives it: sqlite3_reset()
// can run JavaScript through an aggregate's xFinal.
SteppingStatementGuard stepping(db, stmt);
+ // Throwing can run JS that closes the database and frees `stmt`.
bool needs_reset = true;
auto reset = OnScopeLeave([&]() {
- if (needs_reset) sqlite3_reset(stmt);
+ if (needs_reset) sqlite3_reset(statement->statement_.get());
});
int r = sqlite3_step(stmt);
diff --git a/test/parallel/test-sqlite-error-setter-reentry.js b/test/parallel/test-sqlite-error-setter-reentry.js
new file mode 100644
index 00000000000..d3d8b6ba6dd
--- /dev/null
+++ b/test/parallel/test-sqlite-error-setter-reentry.js
@@ -0,0 +1,61 @@
+'use strict';
+
+const { skipIfSQLiteMissing, mustCall } = require('../common');
+skipIfSQLiteMissing();
+const assert = require('node:assert');
+const { test } = require('node:test');
+const { Database } = require('node:sqlite');
+
+// Setting `code` on a thrown error runs Error.prototype setters. Closing the
+// database there must not crash run() or get().
+function closeFromCodeSetter(db, fn) {
+ Object.defineProperty(Error.prototype, 'code', {
+ __proto__: null,
+ configurable: true,
+ get: undefined,
+ set: mustCall(() => {
+ delete Error.prototype.code;
+ db.close();
+ }),
+ });
+ try {
+ return fn();
+ } finally {
+ delete Error.prototype.code;
+ }
+}
+
+const cases = [
+ {
+ name: 'statement.run() failing in sqlite3_step()',
+ sql: 'INSERT INTO t VALUES (1)',
+ call: (db, sql) => db.prepare(sql).run(),
+ error: { message: 'UNIQUE constraint failed: t.x' },
+ },
+ {
+ name: 'statement.get() failing to convert a row',
+ sql: 'SELECT 9007199254740993',
+ call: (db, sql) => db.prepare(sql).get(),
+ error: { name: 'RangeError', message: /too large/ },
+ },
+ {
+ name: 'tag store run() failing in sqlite3_step()',
+ call: (db) => db.createTagStore().run`INSERT INTO t VALUES (1)`,
+ error: { message: 'UNIQUE constraint failed: t.x' },
+ },
+ {
+ name: 'tag store get() failing to convert a row',
+ call: (db) => db.createTagStore().get`SELECT 9007199254740993`,
+ error: { name: 'RangeError', message: /too large/ },
+ },
+];
+
+for (const { name, sql, call, error } of cases) {
+ test(`database.close() from an error setter during ${name}`, () => {
+ const db = new Database(':memory:');
+ db.exec('CREATE TABLE t (x UNIQUE); INSERT INTO t VALUES (1);');
+
+ assert.throws(() => closeFromCodeSetter(db, () => call(db, sql)), error);
+ assert.strictEqual(db.isOpen, false);
+ });
+}