Skip to content

fix: drain thread pool before closing db handle to prevent use-after-free #385

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
isaacrowntree wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: drain thread pool before closing db handle to prevent use-after-free #385

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
15 changes: 14 additions & 1 deletion cpp/DBHostObject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,10 +237,16 @@ void DBHostObject::create_jsi_functions(jsi::Runtime &rt) {
function_map["close"] = HFN(this) {
invalidated = true;

// Drain any in-flight async queries before closing the db handle.
// Without this, a queued/running execute() on the thread pool may
// dereference the freed sqlite3* pointer → heap corruption / SIGABRT.
thread_pool->waitFinished();

#ifdef OP_SQLITE_USE_LIBSQL
opsqlite_libsql_close(db);
#else
opsqlite_close(db);
db = nullptr;
#endif

return {};
Expand Down Expand Up @@ -671,7 +677,14 @@ void DBHostObject::invalidate() {
}

invalidated = true;
thread_pool->restartPool();

// Drain in-flight thread pool work before closing the db handle.
// restartPool() joins threads (waiting for the current task) but then
// needlessly re-creates the pool. waitFinished() is sufficient: it
// blocks until the queue is empty and no worker is busy, then the
// ThreadPool destructor (via shared_ptr release) joins the threads.
thread_pool->waitFinished();

#ifdef OP_SQLITE_USE_LIBSQL
opsqlite_libsql_close(db);
#else
Expand Down
Loading