Skip to content

sqlite: check database state before calling SQLite #64812

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
trivikr wants to merge 1 commit into
base: main
Choose a base branch
from
+31 −2
Open

sqlite: check database state before calling SQLite #64812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/node_sqlite.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2396,7 +2396,10 @@ void DatabaseSync::EnableLoadExtension(
const FunctionCallbackInfo<Value>& args) {
DatabaseSync* db;
ASSIGN_OR_RETURN_UNWRAP(&db, args.This());
auto isolate = args.GetIsolate();
Environment* env = Environment::GetCurrent(args);
THROW_AND_RETURN_ON_BAD_STATE(env, !db->IsOpen(), "database is not open");

Isolate* isolate = env->isolate();
if (!args[0]->IsBoolean()) {
THROW_ERR_INVALID_ARG_TYPE(isolate,
"The \"allow\" argument must be a boolean.");
Expand Down Expand Up @@ -2424,7 +2427,7 @@ void DatabaseSync::EnableDefensive(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args);
THROW_AND_RETURN_ON_BAD_STATE(env, !db->IsOpen(), "database is not open");

auto isolate = args.GetIsolate();
Isolate* isolate = env->isolate();
if (!args[0]->IsBoolean()) {
THROW_ERR_INVALID_ARG_TYPE(isolate,
"The \"active\" argument must be a boolean.");
Expand Down Expand Up @@ -2475,6 +2478,8 @@ void DatabaseSync::SetAuthorizer(const FunctionCallbackInfo<Value>& args) {
DatabaseSync* db;
ASSIGN_OR_RETURN_UNWRAP(&db, args.This());
Environment* env = Environment::GetCurrent(args);
THROW_AND_RETURN_ON_BAD_STATE(env, !db->IsOpen(), "database is not open");

Isolate* isolate = env->isolate();

if (args[0]->IsNull()) {
Expand Down
12 changes: 12 additions & 0 deletions test/parallel/test-sqlite-authz.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,4 +275,16 @@ suite('DatabaseSync.prototype.setAuthorizer()', () => {
message: /The "callback" argument must be a function/
});
});

it('throws if database is not open', () => {
const db = new DatabaseSync(':memory:');
db.close();

assert.throws(() => {
db.setAuthorizer(() => constants.SQLITE_OK);
}, {
code: 'ERR_INVALID_STATE',
message: 'database is not open',
});
});
});
12 changes: 12 additions & 0 deletions test/parallel/test-sqlite-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,15 @@ test('throws if options.defensive is provided but is not a boolean', (t) => {
message: 'The "options.defensive" argument must be a boolean.',
});
});

test('enableLoadExtension() throws if database is not open', (t) => {
const db = new DatabaseSync(':memory:', { allowExtension: true });
db.close();

t.assert.throws(() => {
db.enableLoadExtension(false);
}, {
code: 'ERR_INVALID_STATE',
message: 'database is not open',
});
});
Loading