Commit 90a8b23

Browse files
trivikraduh95
trivikr
authored and
aduh95
committed
sqlite: invalidate sessions when closing database
DatabaseSync::DeleteSessions() deleted native sqlite3_session handles without clearing the pointers held by their Session wrappers. Reopening the database allowed stale session handles to be used, crashing the process. Track Session wrappers and delete sessions through Session::Delete() so the wrappers are marked closed. Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: codex:gpt-5.6-sol PR-URL: #64783Fixes: #64782 Reviewed-By: Aviv Keller <me@aviv.sh>
1 parent cf425ad commit 90a8b23

3 files changed

Lines changed: 37 additions & 7 deletions

File tree

‎src/node_sqlite.cc‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -912,10 +912,9 @@ void DatabaseSync::RemoveBackup(BackupJob* job) {
912912
voidDatabaseSync::DeleteSessions() {
913913
// all attached sessions need to be deleted before the database is closed
914914
// https://www.sqlite.org/session/sqlite3session_create.html
915-
for (auto* session : sessions_) {
916-
sqlite3session_delete(session);
915+
while (!sessions_.empty()) {
916+
(*sessions_.begin())->Delete();
917917
}
918-
sessions_.clear();
919918
}
920919

921920
DatabaseSync::~DatabaseSync() {
@@ -2118,13 +2117,22 @@ void DatabaseSync::CreateSession(const FunctionCallbackInfo<Value>& args) {
21182117
sqlite3_session* pSession;
21192118
int r = sqlite3session_create(db->connection_, db_name.c_str(), &pSession);
21202119
CHECK_ERROR_OR_THROW(env->isolate(), db, r, SQLITE_OK, void());
2121-
db->sessions_.insert(pSession);
2120+
bool wrapper_owns_session = false;
2121+
auto delete_session_on_failure = OnScopeLeave([&]() {
2122+
if (!wrapper_owns_session) {
2123+
sqlite3session_delete(pSession);
2124+
}
2125+
});
21222126

21232127
r = sqlite3session_attach(pSession, table == "" ? nullptr : table.c_str());
21242128
CHECK_ERROR_OR_THROW(env->isolate(), db, r, SQLITE_OK, void());
21252129

21262130
BaseObjectPtr<Session> session =
21272131
Session::Create(env, BaseObjectPtr<DatabaseSync>(db), pSession);
2132+
if (!session) {
2133+
return;
2134+
}
2135+
wrapper_owns_session = true;
21282136
args.GetReturnValue().Set(session->object());
21292137
}
21302138

@@ -3813,6 +3821,7 @@ Session::Session(Environment* env,
38133821
: BaseObject(env, object),
38143822
session_(session),
38153823
database_(std::move(database)) {
3824+
database_->sessions_.insert(this);
38163825
MakeWeak();
38173826
}
38183827

@@ -3905,10 +3914,12 @@ void Session::Dispose(const v8::FunctionCallbackInfo<v8::Value>& args) {
39053914
}
39063915

39073916
voidSession::Delete() {
3908-
if (!database_ || !database_->connection_ || session_ == nullptr) return;
3917+
if (session_ == nullptr) return;
39093918
sqlite3session_delete(session_);
3910-
database_->sessions_.erase(session_);
39113919
session_ = nullptr;
3920+
if (database_) {
3921+
database_->sessions_.erase(this);
3922+
}
39123923
}
39133924

39143925
voidDefineConstants(Local<Object> target) {

‎src/node_sqlite.h‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ class DatabaseSyncLimits;
133133
classStatementSyncIterator;
134134
classStatementSync;
135135
classBackupJob;
136+
classSession;
136137

137138
classStatementExecutionHelper {
138139
public:
@@ -243,7 +244,7 @@ class DatabaseSync : public BaseObject {
243244
bool ignore_next_sqlite_error_;
244245

245246
std::set<BackupJob*> backups_;
246-
std::set<sqlite3_session*> sessions_;
247+
std::unordered_set<Session*> sessions_;
247248
std::unordered_set<StatementSync*> statements_;
248249

249250
friendclassDatabaseSyncLimits;
@@ -360,6 +361,8 @@ class Session : public BaseObject {
360361
voidDelete();
361362
sqlite3_session* session_;
362363
BaseObjectPtr<DatabaseSync> database_; // The Parent Database
364+
365+
friendclassDatabaseSync;
363366
};
364367

365368
classSQLTagStore : publicBaseObject {

‎test/parallel/test-sqlite-session.js‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,22 @@ test('session.changeset() - closed database results in exception', (t) => {
8181
});
8282
});
8383

84+
test('session methods - reopened database results in exception',(t)=>{
85+
for(constmethodof['changeset','close']){
86+
constdatabase=newDatabaseSync(':memory:');
87+
constsession=database.createSession();
88+
database.close();
89+
database.open();
90+
91+
t.assert.throws(()=>{
92+
session[method]();
93+
},{
94+
name: 'Error',
95+
message: 'session is not open',
96+
});
97+
}
98+
});
99+
84100
test('database.applyChangeset() - closed database results in exception',(t)=>{
85101
constdatabase=newDatabaseSync(':memory:');
86102
constsession=database.createSession();

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Commit 90a8b23
Browse files
trivikraduh95
trivikr
authored and
aduh95
committed
sqlite: invalidate sessions when closing database
DatabaseSync::DeleteSessions() deleted native sqlite3_session handles
without clearing the pointers held by their Session wrappers. Reopening
the database allowed stale session handles to be used, crashing the
process.
Track Session wrappers and delete sessions through Session::Delete() so
the wrappers are marked closed.
Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com>
Assisted-by: codex:gpt-5.6-sol
PR-URL: #64783Fixes: #64782
Reviewed-By: Aviv Keller <me@aviv.sh>
1 parent cf425ad commit 90a8b23
3 files changed
Lines changed: 37 additions & 7 deletions
File tree
‎src/node_sqlite.cc‎
Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -912,10 +912,9 @@ void DatabaseSync::RemoveBackup(BackupJob* job) {
912912
voidDatabaseSync::DeleteSessions() {
913913
// all attached sessions need to be deleted before the database is closed
914914
// https://www.sqlite.org/session/sqlite3session_create.html
915-
for (auto* session : sessions_) {
916-
sqlite3session_delete(session);
915+
while (!sessions_.empty()) {
916+
(*sessions_.begin())->Delete();
917917
 }
918-
 sessions_.clear();
919918
}
920919

921920
DatabaseSync::~DatabaseSync() {
@@ -2118,13 +2117,22 @@ void DatabaseSync::CreateSession(const FunctionCallbackInfo<Value>& args) {
21182117
 sqlite3_session* pSession;
21192118
int r = sqlite3session_create(db->connection_, db_name.c_str(), &pSession);
21202119
CHECK_ERROR_OR_THROW(env->isolate(), db, r, SQLITE_OK, void());
2121-
 db->sessions_.insert(pSession);
2120+
bool wrapper_owns_session = false;
2121+
auto delete_session_on_failure = OnScopeLeave([&]() {
2122+
if (!wrapper_owns_session) {
2123+
sqlite3session_delete(pSession);
2124+
 }
2125+
 });
21222126

21232127
 r = sqlite3session_attach(pSession, table == "" ? nullptr : table.c_str());
21242128
CHECK_ERROR_OR_THROW(env->isolate(), db, r, SQLITE_OK, void());
21252129

21262130
 BaseObjectPtr<Session> session =
21272131
Session::Create(env, BaseObjectPtr<DatabaseSync>(db), pSession);
2132+
if (!session) {
2133+
return;
2134+
 }
2135+
 wrapper_owns_session = true;
21282136
 args.GetReturnValue().Set(session->object());
21292137
}
21302138

@@ -3813,6 +3821,7 @@ Session::Session(Environment* env,
38133821
 : BaseObject(env, object),
38143822
 session_(session),
38153823
 database_(std::move(database)) {
3824+
 database_->sessions_.insert(this);
38163825
MakeWeak();
38173826
}
38183827

@@ -3905,10 +3914,12 @@ void Session::Dispose(const v8::FunctionCallbackInfo<v8::Value>& args) {
39053914
}
39063915

39073916
voidSession::Delete() {
3908-
if (!database_ || !database_->connection_ || session_ == nullptr) return;
3917+
if (session_ == nullptr) return;
39093918
sqlite3session_delete(session_);
3910-
 database_->sessions_.erase(session_);
39113919
 session_ = nullptr;
3920+
if (database_) {
3921+
 database_->sessions_.erase(this);
3922+
 }
39123923
}
39133924

39143925
voidDefineConstants(Local<Object> target) {
‎src/node_sqlite.h‎
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ class DatabaseSyncLimits;
133133
classStatementSyncIterator;
134134
classStatementSync;
135135
classBackupJob;
136+
classSession;
136137

137138
classStatementExecutionHelper {
138139
public:
@@ -243,7 +244,7 @@ class DatabaseSync : public BaseObject {
243244
bool ignore_next_sqlite_error_;
244245

245246
 std::set<BackupJob*> backups_;
246-
 std::set<sqlite3_session*> sessions_;
247+
 std::unordered_set<Session*> sessions_;
247248
 std::unordered_set<StatementSync*> statements_;
248249

249250
friendclassDatabaseSyncLimits;
@@ -360,6 +361,8 @@ class Session : public BaseObject {
360361
voidDelete();
361362
 sqlite3_session* session_;
362363
 BaseObjectPtr<DatabaseSync> database_; // The Parent Database
364+
365+
friendclassDatabaseSync;
363366
};
364367

365368
classSQLTagStore : publicBaseObject {
‎test/parallel/test-sqlite-session.js‎
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,22 @@ test('session.changeset() - closed database results in exception', (t) => {
8181
});
8282
});
8383

84+
test('session methods - reopened database results in exception',(t)=>{
85+
for(constmethodof['changeset','close']){
86+
constdatabase=newDatabaseSync(':memory:');
87+
constsession=database.createSession();
88+
database.close();
89+
database.open();
90+
91+
t.assert.throws(()=>{
92+
session[method]();
93+
},{
94+
name: 'Error',
95+
message: 'session is not open',
96+
});
97+
}
98+
});
99+
84100
test('database.applyChangeset() - closed database results in exception',(t)=>{
85101
constdatabase=newDatabaseSync(':memory:');
86102
constsession=database.createSession();
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 90a8b23
Browse files
trivikraduh95
trivikr
authored and
aduh95
committed
sqlite: invalidate sessions when closing database
DatabaseSync::DeleteSessions() deleted native sqlite3_session handles
without clearing the pointers held by their Session wrappers. Reopening
the database allowed stale session handles to be used, crashing the
process.
Track Session wrappers and delete sessions through Session::Delete() so
the wrappers are marked closed.
Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com>
Assisted-by: codex:gpt-5.6-sol
PR-URL: #64783Fixes: #64782
Reviewed-By: Aviv Keller <me@aviv.sh>
1 parent cf425ad commit 90a8b23
3 files changed
Lines changed: 37 additions & 7 deletions
File tree
‎src/node_sqlite.cc‎
Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -912,10 +912,9 @@ void DatabaseSync::RemoveBackup(BackupJob* job) {
912912
voidDatabaseSync::DeleteSessions() {
913913
// all attached sessions need to be deleted before the database is closed
914914
// https://www.sqlite.org/session/sqlite3session_create.html
915-
for (auto* session : sessions_) {
916-
sqlite3session_delete(session);
915+
while (!sessions_.empty()) {
916+
(*sessions_.begin())->Delete();
917917
 }
918-
 sessions_.clear();
919918
}
920919

921920
DatabaseSync::~DatabaseSync() {
@@ -2118,13 +2117,22 @@ void DatabaseSync::CreateSession(const FunctionCallbackInfo<Value>& args) {
21182117
 sqlite3_session* pSession;
21192118
int r = sqlite3session_create(db->connection_, db_name.c_str(), &pSession);
21202119
CHECK_ERROR_OR_THROW(env->isolate(), db, r, SQLITE_OK, void());
2121-
 db->sessions_.insert(pSession);
2120+
bool wrapper_owns_session = false;
2121+
auto delete_session_on_failure = OnScopeLeave([&]() {
2122+
if (!wrapper_owns_session) {
2123+
sqlite3session_delete(pSession);
2124+
 }
2125+
 });
21222126

21232127
 r = sqlite3session_attach(pSession, table == "" ? nullptr : table.c_str());
21242128
CHECK_ERROR_OR_THROW(env->isolate(), db, r, SQLITE_OK, void());
21252129

21262130
 BaseObjectPtr<Session> session =
21272131
Session::Create(env, BaseObjectPtr<DatabaseSync>(db), pSession);
2132+
if (!session) {
2133+
return;
2134+
 }
2135+
 wrapper_owns_session = true;
21282136
 args.GetReturnValue().Set(session->object());
21292137
}
21302138

@@ -3813,6 +3821,7 @@ Session::Session(Environment* env,
38133821
 : BaseObject(env, object),
38143822
 session_(session),
38153823
 database_(std::move(database)) {
3824+
 database_->sessions_.insert(this);
38163825
MakeWeak();
38173826
}
38183827

@@ -3905,10 +3914,12 @@ void Session::Dispose(const v8::FunctionCallbackInfo<v8::Value>& args) {
39053914
}
39063915

39073916
voidSession::Delete() {
3908-
if (!database_ || !database_->connection_ || session_ == nullptr) return;
3917+
if (session_ == nullptr) return;
39093918
sqlite3session_delete(session_);
3910-
 database_->sessions_.erase(session_);
39113919
 session_ = nullptr;
3920+
if (database_) {
3921+
 database_->sessions_.erase(this);
3922+
 }
39123923
}
39133924

39143925
voidDefineConstants(Local<Object> target) {
‎src/node_sqlite.h‎
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ class DatabaseSyncLimits;
133133
classStatementSyncIterator;
134134
classStatementSync;
135135
classBackupJob;
136+
classSession;
136137

137138
classStatementExecutionHelper {
138139
public:
@@ -243,7 +244,7 @@ class DatabaseSync : public BaseObject {
243244
bool ignore_next_sqlite_error_;
244245

245246
 std::set<BackupJob*> backups_;
246-
 std::set<sqlite3_session*> sessions_;
247+
 std::unordered_set<Session*> sessions_;
247248
 std::unordered_set<StatementSync*> statements_;
248249

249250
friendclassDatabaseSyncLimits;
@@ -360,6 +361,8 @@ class Session : public BaseObject {
360361
voidDelete();
361362
 sqlite3_session* session_;
362363
 BaseObjectPtr<DatabaseSync> database_; // The Parent Database
364+
365+
friendclassDatabaseSync;
363366
};
364367

365368
classSQLTagStore : publicBaseObject {
‎test/parallel/test-sqlite-session.js‎
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,22 @@ test('session.changeset() - closed database results in exception', (t) => {
8181
});
8282
});
8383

84+
test('session methods - reopened database results in exception',(t)=>{
85+
for(constmethodof['changeset','close']){
86+
constdatabase=newDatabaseSync(':memory:');
87+
constsession=database.createSession();
88+
database.close();
89+
database.open();
90+
91+
t.assert.throws(()=>{
92+
session[method]();
93+
},{
94+
name: 'Error',
95+
message: 'session is not open',
96+
});
97+
}
98+
});
99+
84100
test('database.applyChangeset() - closed database results in exception',(t)=>{
85101
constdatabase=newDatabaseSync(':memory:');
86102
constsession=database.createSession();
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 90a8b23
Browse files
trivikraduh95
trivikr
authored and
aduh95
committed
sqlite: invalidate sessions when closing database
DatabaseSync::DeleteSessions() deleted native sqlite3_session handles
without clearing the pointers held by their Session wrappers. Reopening
the database allowed stale session handles to be used, crashing the
process.
Track Session wrappers and delete sessions through Session::Delete() so
the wrappers are marked closed.
Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com>
Assisted-by: codex:gpt-5.6-sol
PR-URL: #64783Fixes: #64782
Reviewed-By: Aviv Keller <me@aviv.sh>
1 parent cf425ad commit 90a8b23
3 files changed
Lines changed: 37 additions & 7 deletions
File tree
‎src/node_sqlite.cc‎
Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -912,10 +912,9 @@ void DatabaseSync::RemoveBackup(BackupJob* job) {
912912
voidDatabaseSync::DeleteSessions() {
913913
// all attached sessions need to be deleted before the database is closed
914914
// https://www.sqlite.org/session/sqlite3session_create.html
915-
for (auto* session : sessions_) {
916-
sqlite3session_delete(session);
915+
while (!sessions_.empty()) {
916+
(*sessions_.begin())->Delete();
917917
 }
918-
 sessions_.clear();
919918
}
920919

921920
DatabaseSync::~DatabaseSync() {
@@ -2118,13 +2117,22 @@ void DatabaseSync::CreateSession(const FunctionCallbackInfo<Value>& args) {
21182117
 sqlite3_session* pSession;
21192118
int r = sqlite3session_create(db->connection_, db_name.c_str(), &pSession);
21202119
CHECK_ERROR_OR_THROW(env->isolate(), db, r, SQLITE_OK, void());
2121-
 db->sessions_.insert(pSession);
2120+
bool wrapper_owns_session = false;
2121+
auto delete_session_on_failure = OnScopeLeave([&]() {
2122+
if (!wrapper_owns_session) {
2123+
sqlite3session_delete(pSession);
2124+
 }
2125+
 });
21222126

21232127
 r = sqlite3session_attach(pSession, table == "" ? nullptr : table.c_str());
21242128
CHECK_ERROR_OR_THROW(env->isolate(), db, r, SQLITE_OK, void());
21252129

21262130
 BaseObjectPtr<Session> session =
21272131
Session::Create(env, BaseObjectPtr<DatabaseSync>(db), pSession);
2132+
if (!session) {
2133+
return;
2134+
 }
2135+
 wrapper_owns_session = true;
21282136
 args.GetReturnValue().Set(session->object());
21292137
}
21302138

@@ -3813,6 +3821,7 @@ Session::Session(Environment* env,
38133821
 : BaseObject(env, object),
38143822
 session_(session),
38153823
 database_(std::move(database)) {
3824+
 database_->sessions_.insert(this);
38163825
MakeWeak();
38173826
}
38183827

@@ -3905,10 +3914,12 @@ void Session::Dispose(const v8::FunctionCallbackInfo<v8::Value>& args) {
39053914
}
39063915

39073916
voidSession::Delete() {
3908-
if (!database_ || !database_->connection_ || session_ == nullptr) return;
3917+
if (session_ == nullptr) return;
39093918
sqlite3session_delete(session_);
3910-
 database_->sessions_.erase(session_);
39113919
 session_ = nullptr;
3920+
if (database_) {
3921+
 database_->sessions_.erase(this);
3922+
 }
39123923
}
39133924

39143925
voidDefineConstants(Local<Object> target) {
‎src/node_sqlite.h‎
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ class DatabaseSyncLimits;
133133
classStatementSyncIterator;
134134
classStatementSync;
135135
classBackupJob;
136+
classSession;
136137

137138
classStatementExecutionHelper {
138139
public:
@@ -243,7 +244,7 @@ class DatabaseSync : public BaseObject {
243244
bool ignore_next_sqlite_error_;
244245

245246
 std::set<BackupJob*> backups_;
246-
 std::set<sqlite3_session*> sessions_;
247+
 std::unordered_set<Session*> sessions_;
247248
 std::unordered_set<StatementSync*> statements_;
248249

249250
friendclassDatabaseSyncLimits;
@@ -360,6 +361,8 @@ class Session : public BaseObject {
360361
voidDelete();
361362
 sqlite3_session* session_;
362363
 BaseObjectPtr<DatabaseSync> database_; // The Parent Database
364+
365+
friendclassDatabaseSync;
363366
};
364367

365368
classSQLTagStore : publicBaseObject {
‎test/parallel/test-sqlite-session.js‎
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,22 @@ test('session.changeset() - closed database results in exception', (t) => {
8181
});
8282
});
8383

84+
test('session methods - reopened database results in exception',(t)=>{
85+
for(constmethodof['changeset','close']){
86+
constdatabase=newDatabaseSync(':memory:');
87+
constsession=database.createSession();
88+
database.close();
89+
database.open();
90+
91+
t.assert.throws(()=>{
92+
session[method]();
93+
},{
94+
name: 'Error',
95+
message: 'session is not open',
96+
});
97+
}
98+
});
99+
84100
test('database.applyChangeset() - closed database results in exception',(t)=>{
85101
constdatabase=newDatabaseSync(':memory:');
86102
constsession=database.createSession();
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Commit 90a8b23
Browse files
trivikraduh95
trivikr
authored and
aduh95
committed
sqlite: invalidate sessions when closing database
DatabaseSync::DeleteSessions() deleted native sqlite3_session handles
without clearing the pointers held by their Session wrappers. Reopening
the database allowed stale session handles to be used, crashing the
process.
Track Session wrappers and delete sessions through Session::Delete() so
the wrappers are marked closed.
Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com>
Assisted-by: codex:gpt-5.6-sol
PR-URL: #64783Fixes: #64782
Reviewed-By: Aviv Keller <me@aviv.sh>
1 parent cf425ad commit 90a8b23
3 files changed
Lines changed: 37 additions & 7 deletions
File tree
‎src/node_sqlite.cc‎
Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -912,10 +912,9 @@ void DatabaseSync::RemoveBackup(BackupJob* job) {
912912
voidDatabaseSync::DeleteSessions() {
913913
// all attached sessions need to be deleted before the database is closed
914914
// https://www.sqlite.org/session/sqlite3session_create.html
915-
for (auto* session : sessions_) {
916-
sqlite3session_delete(session);
915+
while (!sessions_.empty()) {
916+
(*sessions_.begin())->Delete();
917917
 }
918-
 sessions_.clear();
919918
}
920919

921920
DatabaseSync::~DatabaseSync() {
@@ -2118,13 +2117,22 @@ void DatabaseSync::CreateSession(const FunctionCallbackInfo<Value>& args) {
21182117
 sqlite3_session* pSession;
21192118
int r = sqlite3session_create(db->connection_, db_name.c_str(), &pSession);
21202119
CHECK_ERROR_OR_THROW(env->isolate(), db, r, SQLITE_OK, void());
2121-
 db->sessions_.insert(pSession);
2120+
bool wrapper_owns_session = false;
2121+
auto delete_session_on_failure = OnScopeLeave([&]() {
2122+
if (!wrapper_owns_session) {
2123+
sqlite3session_delete(pSession);
2124+
 }
2125+
 });
21222126

21232127
 r = sqlite3session_attach(pSession, table == "" ? nullptr : table.c_str());
21242128
CHECK_ERROR_OR_THROW(env->isolate(), db, r, SQLITE_OK, void());
21252129

21262130
 BaseObjectPtr<Session> session =
21272131
Session::Create(env, BaseObjectPtr<DatabaseSync>(db), pSession);
2132+
if (!session) {
2133+
return;
2134+
 }
2135+
 wrapper_owns_session = true;
21282136
 args.GetReturnValue().Set(session->object());
21292137
}
21302138

@@ -3813,6 +3821,7 @@ Session::Session(Environment* env,
38133821
 : BaseObject(env, object),
38143822
 session_(session),
38153823
 database_(std::move(database)) {
3824+
 database_->sessions_.insert(this);
38163825
MakeWeak();
38173826
}
38183827

@@ -3905,10 +3914,12 @@ void Session::Dispose(const v8::FunctionCallbackInfo<v8::Value>& args) {
39053914
}
39063915

39073916
voidSession::Delete() {
3908-
if (!database_ || !database_->connection_ || session_ == nullptr) return;
3917+
if (session_ == nullptr) return;
39093918
sqlite3session_delete(session_);
3910-
 database_->sessions_.erase(session_);
39113919
 session_ = nullptr;
3920+
if (database_) {
3921+
 database_->sessions_.erase(this);
3922+
 }
39123923
}
39133924

39143925
voidDefineConstants(Local<Object> target) {
‎src/node_sqlite.h‎
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ class DatabaseSyncLimits;
133133
classStatementSyncIterator;
134134
classStatementSync;
135135
classBackupJob;
136+
classSession;
136137

137138
classStatementExecutionHelper {
138139
public:
@@ -243,7 +244,7 @@ class DatabaseSync : public BaseObject {
243244
bool ignore_next_sqlite_error_;
244245

245246
 std::set<BackupJob*> backups_;
246-
 std::set<sqlite3_session*> sessions_;
247+
 std::unordered_set<Session*> sessions_;
247248
 std::unordered_set<StatementSync*> statements_;
248249

249250
friendclassDatabaseSyncLimits;
@@ -360,6 +361,8 @@ class Session : public BaseObject {
360361
voidDelete();
361362
 sqlite3_session* session_;
362363
 BaseObjectPtr<DatabaseSync> database_; // The Parent Database
364+
365+
friendclassDatabaseSync;
363366
};
364367

365368
classSQLTagStore : publicBaseObject {
‎test/parallel/test-sqlite-session.js‎
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,22 @@ test('session.changeset() - closed database results in exception', (t) => {
8181
});
8282
});
8383

84+
test('session methods - reopened database results in exception',(t)=>{
85+
for(constmethodof['changeset','close']){
86+
constdatabase=newDatabaseSync(':memory:');
87+
constsession=database.createSession();
88+
database.close();
89+
database.open();
90+
91+
t.assert.throws(()=>{
92+
session[method]();
93+
},{
94+
name: 'Error',
95+
message: 'session is not open',
96+
});
97+
}
98+
});
99+
84100
test('database.applyChangeset() - closed database results in exception',(t)=>{
85101
constdatabase=newDatabaseSync(':memory:');
86102
constsession=database.createSession();
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 90a8b23
Browse files
trivikraduh95
trivikr
authored and
aduh95
committed
sqlite: invalidate sessions when closing database
DatabaseSync::DeleteSessions() deleted native sqlite3_session handles
without clearing the pointers held by their Session wrappers. Reopening
the database allowed stale session handles to be used, crashing the
process.
Track Session wrappers and delete sessions through Session::Delete() so
the wrappers are marked closed.
Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com>
Assisted-by: codex:gpt-5.6-sol
PR-URL: #64783Fixes: #64782
Reviewed-By: Aviv Keller <me@aviv.sh>
1 parent cf425ad commit 90a8b23
3 files changed
Lines changed: 37 additions & 7 deletions
File tree
‎src/node_sqlite.cc‎
Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -912,10 +912,9 @@ void DatabaseSync::RemoveBackup(BackupJob* job) {
912912
voidDatabaseSync::DeleteSessions() {
913913
// all attached sessions need to be deleted before the database is closed
914914
// https://www.sqlite.org/session/sqlite3session_create.html
915-
for (auto* session : sessions_) {
916-
sqlite3session_delete(session);
915+
while (!sessions_.empty()) {
916+
(*sessions_.begin())->Delete();
917917
 }
918-
 sessions_.clear();
919918
}
920919

921920
DatabaseSync::~DatabaseSync() {
@@ -2118,13 +2117,22 @@ void DatabaseSync::CreateSession(const FunctionCallbackInfo<Value>& args) {
21182117
 sqlite3_session* pSession;
21192118
int r = sqlite3session_create(db->connection_, db_name.c_str(), &pSession);
21202119
CHECK_ERROR_OR_THROW(env->isolate(), db, r, SQLITE_OK, void());
2121-
 db->sessions_.insert(pSession);
2120+
bool wrapper_owns_session = false;
2121+
auto delete_session_on_failure = OnScopeLeave([&]() {
2122+
if (!wrapper_owns_session) {
2123+
sqlite3session_delete(pSession);
2124+
 }
2125+
 });
21222126

21232127
 r = sqlite3session_attach(pSession, table == "" ? nullptr : table.c_str());
21242128
CHECK_ERROR_OR_THROW(env->isolate(), db, r, SQLITE_OK, void());
21252129

21262130
 BaseObjectPtr<Session> session =
21272131
Session::Create(env, BaseObjectPtr<DatabaseSync>(db), pSession);
2132+
if (!session) {
2133+
return;
2134+
 }
2135+
 wrapper_owns_session = true;
21282136
 args.GetReturnValue().Set(session->object());
21292137
}
21302138

@@ -3813,6 +3821,7 @@ Session::Session(Environment* env,
38133821
 : BaseObject(env, object),
38143822
 session_(session),
38153823
 database_(std::move(database)) {
3824+
 database_->sessions_.insert(this);
38163825
MakeWeak();
38173826
}
38183827

@@ -3905,10 +3914,12 @@ void Session::Dispose(const v8::FunctionCallbackInfo<v8::Value>& args) {
39053914
}
39063915

39073916
voidSession::Delete() {
3908-
if (!database_ || !database_->connection_ || session_ == nullptr) return;
3917+
if (session_ == nullptr) return;
39093918
sqlite3session_delete(session_);
3910-
 database_->sessions_.erase(session_);
39113919
 session_ = nullptr;
3920+
if (database_) {
3921+
 database_->sessions_.erase(this);
3922+
 }
39123923
}
39133924

39143925
voidDefineConstants(Local<Object> target) {
‎src/node_sqlite.h‎
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ class DatabaseSyncLimits;
133133
classStatementSyncIterator;
134134
classStatementSync;
135135
classBackupJob;
136+
classSession;
136137

137138
classStatementExecutionHelper {
138139
public:
@@ -243,7 +244,7 @@ class DatabaseSync : public BaseObject {
243244
bool ignore_next_sqlite_error_;
244245

245246
 std::set<BackupJob*> backups_;
246-
 std::set<sqlite3_session*> sessions_;
247+
 std::unordered_set<Session*> sessions_;
247248
 std::unordered_set<StatementSync*> statements_;
248249

249250
friendclassDatabaseSyncLimits;
@@ -360,6 +361,8 @@ class Session : public BaseObject {
360361
voidDelete();
361362
 sqlite3_session* session_;
362363
 BaseObjectPtr<DatabaseSync> database_; // The Parent Database
364+
365+
friendclassDatabaseSync;
363366
};
364367

365368
classSQLTagStore : publicBaseObject {
‎test/parallel/test-sqlite-session.js‎
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,22 @@ test('session.changeset() - closed database results in exception', (t) => {
8181
});
8282
});
8383

84+
test('session methods - reopened database results in exception',(t)=>{
85+
for(constmethodof['changeset','close']){
86+
constdatabase=newDatabaseSync(':memory:');
87+
constsession=database.createSession();
88+
database.close();
89+
database.open();
90+
91+
t.assert.throws(()=>{
92+
session[method]();
93+
},{
94+
name: 'Error',
95+
message: 'session is not open',
96+
});
97+
}
98+
});
99+
84100
test('database.applyChangeset() - closed database results in exception',(t)=>{
85101
constdatabase=newDatabaseSync(':memory:');
86102
constsession=database.createSession();
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 90a8b23
Browse files
trivikraduh95
trivikr
authored and
aduh95
committed
sqlite: invalidate sessions when closing database
DatabaseSync::DeleteSessions() deleted native sqlite3_session handles
without clearing the pointers held by their Session wrappers. Reopening
the database allowed stale session handles to be used, crashing the
process.
Track Session wrappers and delete sessions through Session::Delete() so
the wrappers are marked closed.
Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com>
Assisted-by: codex:gpt-5.6-sol
PR-URL: #64783Fixes: #64782
Reviewed-By: Aviv Keller <me@aviv.sh>
1 parent cf425ad commit 90a8b23
3 files changed
Lines changed: 37 additions & 7 deletions
File tree
‎src/node_sqlite.cc‎
Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -912,10 +912,9 @@ void DatabaseSync::RemoveBackup(BackupJob* job) {
912912
voidDatabaseSync::DeleteSessions() {
913913
// all attached sessions need to be deleted before the database is closed
914914
// https://www.sqlite.org/session/sqlite3session_create.html
915-
for (auto* session : sessions_) {
916-
sqlite3session_delete(session);
915+
while (!sessions_.empty()) {
916+
(*sessions_.begin())->Delete();
917917
 }
918-
 sessions_.clear();
919918
}
920919

921920
DatabaseSync::~DatabaseSync() {
@@ -2118,13 +2117,22 @@ void DatabaseSync::CreateSession(const FunctionCallbackInfo<Value>& args) {
21182117
 sqlite3_session* pSession;
21192118
int r = sqlite3session_create(db->connection_, db_name.c_str(), &pSession);
21202119
CHECK_ERROR_OR_THROW(env->isolate(), db, r, SQLITE_OK, void());
2121-
 db->sessions_.insert(pSession);
2120+
bool wrapper_owns_session = false;
2121+
auto delete_session_on_failure = OnScopeLeave([&]() {
2122+
if (!wrapper_owns_session) {
2123+
sqlite3session_delete(pSession);
2124+
 }
2125+
 });
21222126

21232127
 r = sqlite3session_attach(pSession, table == "" ? nullptr : table.c_str());
21242128
CHECK_ERROR_OR_THROW(env->isolate(), db, r, SQLITE_OK, void());
21252129

21262130
 BaseObjectPtr<Session> session =
21272131
Session::Create(env, BaseObjectPtr<DatabaseSync>(db), pSession);
2132+
if (!session) {
2133+
return;
2134+
 }
2135+
 wrapper_owns_session = true;
21282136
 args.GetReturnValue().Set(session->object());
21292137
}
21302138

@@ -3813,6 +3821,7 @@ Session::Session(Environment* env,
38133821
 : BaseObject(env, object),
38143822
 session_(session),
38153823
 database_(std::move(database)) {
3824+
 database_->sessions_.insert(this);
38163825
MakeWeak();
38173826
}
38183827

@@ -3905,10 +3914,12 @@ void Session::Dispose(const v8::FunctionCallbackInfo<v8::Value>& args) {
39053914
}
39063915

39073916
voidSession::Delete() {
3908-
if (!database_ || !database_->connection_ || session_ == nullptr) return;
3917+
if (session_ == nullptr) return;
39093918
sqlite3session_delete(session_);
3910-
 database_->sessions_.erase(session_);
39113919
 session_ = nullptr;
3920+
if (database_) {
3921+
 database_->sessions_.erase(this);
3922+
 }
39123923
}
39133924

39143925
voidDefineConstants(Local<Object> target) {
‎src/node_sqlite.h‎
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ class DatabaseSyncLimits;
133133
classStatementSyncIterator;
134134
classStatementSync;
135135
classBackupJob;
136+
classSession;
136137

137138
classStatementExecutionHelper {
138139
public:
@@ -243,7 +244,7 @@ class DatabaseSync : public BaseObject {
243244
bool ignore_next_sqlite_error_;
244245

245246
 std::set<BackupJob*> backups_;
246-
 std::set<sqlite3_session*> sessions_;
247+
 std::unordered_set<Session*> sessions_;
247248
 std::unordered_set<StatementSync*> statements_;
248249

249250
friendclassDatabaseSyncLimits;
@@ -360,6 +361,8 @@ class Session : public BaseObject {
360361
voidDelete();
361362
 sqlite3_session* session_;
362363
 BaseObjectPtr<DatabaseSync> database_; // The Parent Database
364+
365+
friendclassDatabaseSync;
363366
};
364367

365368
classSQLTagStore : publicBaseObject {
‎test/parallel/test-sqlite-session.js‎
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,22 @@ test('session.changeset() - closed database results in exception', (t) => {
8181
});
8282
});
8383

84+
test('session methods - reopened database results in exception',(t)=>{
85+
for(constmethodof['changeset','close']){
86+
constdatabase=newDatabaseSync(':memory:');
87+
constsession=database.createSession();
88+
database.close();
89+
database.open();
90+
91+
t.assert.throws(()=>{
92+
session[method]();
93+
},{
94+
name: 'Error',
95+
message: 'session is not open',
96+
});
97+
}
98+
});
99+
84100
test('database.applyChangeset() - closed database results in exception',(t)=>{
85101
constdatabase=newDatabaseSync(':memory:');
86102
constsession=database.createSession();
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Commit 90a8b23
Browse files
trivikraduh95
trivikr
authored and
aduh95
committed
sqlite: invalidate sessions when closing database
DatabaseSync::DeleteSessions() deleted native sqlite3_session handles
without clearing the pointers held by their Session wrappers. Reopening
the database allowed stale session handles to be used, crashing the
process.
Track Session wrappers and delete sessions through Session::Delete() so
the wrappers are marked closed.
Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com>
Assisted-by: codex:gpt-5.6-sol
PR-URL: #64783Fixes: #64782
Reviewed-By: Aviv Keller <me@aviv.sh>
1 parent cf425ad commit 90a8b23
3 files changed
Lines changed: 37 additions & 7 deletions
File tree
‎src/node_sqlite.cc‎
Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -912,10 +912,9 @@ void DatabaseSync::RemoveBackup(BackupJob* job) {
912912
voidDatabaseSync::DeleteSessions() {
913913
// all attached sessions need to be deleted before the database is closed
914914
// https://www.sqlite.org/session/sqlite3session_create.html
915-
for (auto* session : sessions_) {
916-
sqlite3session_delete(session);
915+
while (!sessions_.empty()) {
916+
(*sessions_.begin())->Delete();
917917
 }
918-
 sessions_.clear();
919918
}
920919

921920
DatabaseSync::~DatabaseSync() {
@@ -2118,13 +2117,22 @@ void DatabaseSync::CreateSession(const FunctionCallbackInfo<Value>& args) {
21182117
 sqlite3_session* pSession;
21192118
int r = sqlite3session_create(db->connection_, db_name.c_str(), &pSession);
21202119
CHECK_ERROR_OR_THROW(env->isolate(), db, r, SQLITE_OK, void());
2121-
 db->sessions_.insert(pSession);
2120+
bool wrapper_owns_session = false;
2121+
auto delete_session_on_failure = OnScopeLeave([&]() {
2122+
if (!wrapper_owns_session) {
2123+
sqlite3session_delete(pSession);
2124+
 }
2125+
 });
21222126

21232127
 r = sqlite3session_attach(pSession, table == "" ? nullptr : table.c_str());
21242128
CHECK_ERROR_OR_THROW(env->isolate(), db, r, SQLITE_OK, void());
21252129

21262130
 BaseObjectPtr<Session> session =
21272131
Session::Create(env, BaseObjectPtr<DatabaseSync>(db), pSession);
2132+
if (!session) {
2133+
return;
2134+
 }
2135+
 wrapper_owns_session = true;
21282136
 args.GetReturnValue().Set(session->object());
21292137
}
21302138

@@ -3813,6 +3821,7 @@ Session::Session(Environment* env,
38133821
 : BaseObject(env, object),
38143822
 session_(session),
38153823
 database_(std::move(database)) {
3824+
 database_->sessions_.insert(this);
38163825
MakeWeak();
38173826
}
38183827

@@ -3905,10 +3914,12 @@ void Session::Dispose(const v8::FunctionCallbackInfo<v8::Value>& args) {
39053914
}
39063915

39073916
voidSession::Delete() {
3908-
if (!database_ || !database_->connection_ || session_ == nullptr) return;
3917+
if (session_ == nullptr) return;
39093918
sqlite3session_delete(session_);
3910-
 database_->sessions_.erase(session_);
39113919
 session_ = nullptr;
3920+
if (database_) {
3921+
 database_->sessions_.erase(this);
3922+
 }
39123923
}
39133924

39143925
voidDefineConstants(Local<Object> target) {
‎src/node_sqlite.h‎
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ class DatabaseSyncLimits;
133133
classStatementSyncIterator;
134134
classStatementSync;
135135
classBackupJob;
136+
classSession;
136137

137138
classStatementExecutionHelper {
138139
public:
@@ -243,7 +244,7 @@ class DatabaseSync : public BaseObject {
243244
bool ignore_next_sqlite_error_;
244245

245246
 std::set<BackupJob*> backups_;
246-
 std::set<sqlite3_session*> sessions_;
247+
 std::unordered_set<Session*> sessions_;
247248
 std::unordered_set<StatementSync*> statements_;
248249

249250
friendclassDatabaseSyncLimits;
@@ -360,6 +361,8 @@ class Session : public BaseObject {
360361
voidDelete();
361362
 sqlite3_session* session_;
362363
 BaseObjectPtr<DatabaseSync> database_; // The Parent Database
364+
365+
friendclassDatabaseSync;
363366
};
364367

365368
classSQLTagStore : publicBaseObject {
‎test/parallel/test-sqlite-session.js‎
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,22 @@ test('session.changeset() - closed database results in exception', (t) => {
8181
});
8282
});
8383

84+
test('session methods - reopened database results in exception',(t)=>{
85+
for(constmethodof['changeset','close']){
86+
constdatabase=newDatabaseSync(':memory:');
87+
constsession=database.createSession();
88+
database.close();
89+
database.open();
90+
91+
t.assert.throws(()=>{
92+
session[method]();
93+
},{
94+
name: 'Error',
95+
message: 'session is not open',
96+
});
97+
}
98+
});
99+
84100
test('database.applyChangeset() - closed database results in exception',(t)=>{
85101
constdatabase=newDatabaseSync(':memory:');
86102
constsession=database.createSession();
0 commit comments
Comments
 (0)