Commit c2a5251

Browse files
3zrvaduh95
3zrv
authored and
aduh95
committed
sqlite: fix crash when a session outlives its database
Keep the database alive while a session is open so that closing the database before the session does not leave the session pointing at freed memory. Signed-off-by: Mohamed Sayed <k@3zrv.com> PR-URL: #63797Fixes: #63796 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Edy Silva <edigleyssonsilva@gmail.com>
1 parent d7d4f0e commit c2a5251

3 files changed

Lines changed: 40 additions & 8 deletions

File tree

‎src/node_sqlite.cc‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2124,7 +2124,7 @@ void DatabaseSync::CreateSession(const FunctionCallbackInfo<Value>& args) {
21242124
CHECK_ERROR_OR_THROW(env->isolate(), db, r, SQLITE_OK, void());
21252125

21262126
BaseObjectPtr<Session> session =
2127-
Session::Create(env, BaseObjectWeakPtr<DatabaseSync>(db), pSession);
2127+
Session::Create(env, BaseObjectPtr<DatabaseSync>(db), pSession);
21282128
args.GetReturnValue().Set(session->object());
21292129
}
21302130

@@ -3803,7 +3803,7 @@ void StatementSyncIterator::Return(const FunctionCallbackInfo<Value>& args) {
38033803

38043804
Session::Session(Environment* env,
38053805
Local<Object> object,
3806-
BaseObjectWeakPtr<DatabaseSync> database,
3806+
BaseObjectPtr<DatabaseSync> database,
38073807
sqlite3_session* session)
38083808
: BaseObject(env, object),
38093809
session_(session),
@@ -3816,7 +3816,7 @@ Session::~Session() {
38163816
}
38173817

38183818
BaseObjectPtr<Session> Session::Create(Environment* env,
3819-
BaseObjectWeakPtr<DatabaseSync> database,
3819+
BaseObjectPtr<DatabaseSync> database,
38203820
sqlite3_session* session) {
38213821
Local<Object> obj;
38223822
if (!GetConstructorTemplate(env)
@@ -3850,7 +3850,9 @@ Local<FunctionTemplate> Session::GetConstructorTemplate(Environment* env) {
38503850
return tmpl;
38513851
}
38523852

3853-
voidSession::MemoryInfo(MemoryTracker* tracker) const {}
3853+
voidSession::MemoryInfo(MemoryTracker* tracker) const {
3854+
tracker->TrackField("database", database_);
3855+
}
38543856

38553857
template <Sqlite3ChangesetGenFunc sqliteChangesetFunc>
38563858
voidSession::Changeset(const FunctionCallbackInfo<Value>& args) {

‎src/node_sqlite.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ class Session : public BaseObject {
339339
public:
340340
Session(Environment* env,
341341
v8::Local<v8::Object> object,
342-
BaseObjectWeakPtr<DatabaseSync> database,
342+
BaseObjectPtr<DatabaseSync> database,
343343
sqlite3_session* session);
344344
~Session() override;
345345
template <Sqlite3ChangesetGenFunc sqliteChangesetFunc>
@@ -349,7 +349,7 @@ class Session : public BaseObject {
349349
static v8::Local<v8::FunctionTemplate> GetConstructorTemplate(
350350
Environment* env);
351351
static BaseObjectPtr<Session> Create(Environment* env,
352-
BaseObjectWeakPtr<DatabaseSync> database,
352+
BaseObjectPtr<DatabaseSync> database,
353353
sqlite3_session* session);
354354

355355
voidMemoryInfo(MemoryTracker* tracker) constoverride;
@@ -359,7 +359,7 @@ class Session : public BaseObject {
359359
private:
360360
voidDelete();
361361
sqlite3_session* session_;
362-
BaseObjectWeakPtr<DatabaseSync> database_; // The Parent Database
362+
BaseObjectPtr<DatabaseSync> database_; // The Parent Database
363363
};
364364

365365
classSQLTagStore : publicBaseObject {

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

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Flags: --experimental-sqlite
1+
// Flags: --expose-gc --experimental-sqlite
22
'use strict';
33
const{ skipIfSQLiteMissing }=require('../common');
44
skipIfSQLiteMissing();
@@ -589,6 +589,36 @@ test('session.close() - closing twice', (t) => {
589589
});
590590
});
591591

592+
test('session - keeps its database alive after the db handle is dropped',async(t)=>{
593+
const{ gcUntil, onGC }=require('../common/gc');
594+
595+
// The DatabaseSync handle is created in a nested scope and never referenced
596+
// again, so the returned session is the only thing keeping it reachable.
597+
letdbCollected=false;
598+
constsession=(()=>{
599+
constdatabase=newDatabaseSync(':memory:');
600+
database.exec('CREATE TABLE data(key INTEGER PRIMARY KEY, value TEXT)');
601+
onGC(database,{ongc: ()=>{dbCollected=true;}});
602+
consts=database.createSession();
603+
database.exec("INSERT INTO data VALUES (1, 'hello')");
604+
returns;
605+
})();
606+
607+
// The session must keep the database alive across GC. Previously it held
608+
// only a weak reference, so the database could be collected and using the
609+
// session afterwards dereferenced a dangling pointer and crashed.
610+
awaitgcUntil('database is collected',()=>dbCollected,5).then(
611+
()=>{thrownewError('session did not keep its database alive');},
612+
()=>{},// Expected: the database is never collected, so gcUntil rejects.
613+
);
614+
t.assert.strictEqual(dbCollected,false);
615+
616+
// The database is still open and usable through the still-alive session.
617+
constchangeset=session.changeset();
618+
t.assert.ok(changeset.byteLength>0);
619+
session.close();
620+
});
621+
592622
test('session supports ERM',(t)=>{
593623
constdatabase=newDatabaseSync(':memory:');
594624
letafterDisposeSession;

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 c2a5251
Browse files
3zrvaduh95
3zrv
authored and
aduh95
committed
sqlite: fix crash when a session outlives its database
Keep the database alive while a session is open so that closing the
database before the session does not leave the session pointing at
freed memory.
Signed-off-by: Mohamed Sayed <k@3zrv.com>
PR-URL: #63797Fixes: #63796
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Edy Silva <edigleyssonsilva@gmail.com>
1 parent d7d4f0e commit c2a5251
3 files changed
Lines changed: 40 additions & 8 deletions
File tree
‎src/node_sqlite.cc‎
Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2124,7 +2124,7 @@ void DatabaseSync::CreateSession(const FunctionCallbackInfo<Value>& args) {
21242124
CHECK_ERROR_OR_THROW(env->isolate(), db, r, SQLITE_OK, void());
21252125

21262126
 BaseObjectPtr<Session> session =
2127-
Session::Create(env, BaseObjectWeakPtr<DatabaseSync>(db), pSession);
2127+
Session::Create(env, BaseObjectPtr<DatabaseSync>(db), pSession);
21282128
 args.GetReturnValue().Set(session->object());
21292129
}
21302130

@@ -3803,7 +3803,7 @@ void StatementSyncIterator::Return(const FunctionCallbackInfo<Value>& args) {
38033803

38043804
Session::Session(Environment* env,
38053805
 Local<Object> object,
3806-
BaseObjectWeakPtr<DatabaseSync> database,
3806+
BaseObjectPtr<DatabaseSync> database,
38073807
 sqlite3_session* session)
38083808
 : BaseObject(env, object),
38093809
 session_(session),
@@ -3816,7 +3816,7 @@ Session::~Session() {
38163816
}
38173817

38183818
BaseObjectPtr<Session> Session::Create(Environment* env,
3819-
BaseObjectWeakPtr<DatabaseSync> database,
3819+
BaseObjectPtr<DatabaseSync> database,
38203820
 sqlite3_session* session) {
38213821
 Local<Object> obj;
38223822
if (!GetConstructorTemplate(env)
@@ -3850,7 +3850,9 @@ Local<FunctionTemplate> Session::GetConstructorTemplate(Environment* env) {
38503850
return tmpl;
38513851
}
38523852

3853-
voidSession::MemoryInfo(MemoryTracker* tracker) const {}
3853+
voidSession::MemoryInfo(MemoryTracker* tracker) const {
3854+
 tracker->TrackField("database", database_);
3855+
}
38543856

38553857
template <Sqlite3ChangesetGenFunc sqliteChangesetFunc>
38563858
voidSession::Changeset(const FunctionCallbackInfo<Value>& args) {
‎src/node_sqlite.h‎
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ class Session : public BaseObject {
339339
public:
340340
Session(Environment* env,
341341
 v8::Local<v8::Object> object,
342-
BaseObjectWeakPtr<DatabaseSync> database,
342+
BaseObjectPtr<DatabaseSync> database,
343343
 sqlite3_session* session);
344344
~Session() override;
345345
template <Sqlite3ChangesetGenFunc sqliteChangesetFunc>
@@ -349,7 +349,7 @@ class Session : public BaseObject {
349349
static v8::Local<v8::FunctionTemplate> GetConstructorTemplate(
350350
 Environment* env);
351351
static BaseObjectPtr<Session> Create(Environment* env,
352-
BaseObjectWeakPtr<DatabaseSync> database,
352+
BaseObjectPtr<DatabaseSync> database,
353353
 sqlite3_session* session);
354354

355355
voidMemoryInfo(MemoryTracker* tracker) constoverride;
@@ -359,7 +359,7 @@ class Session : public BaseObject {
359359
private:
360360
voidDelete();
361361
 sqlite3_session* session_;
362-
BaseObjectWeakPtr<DatabaseSync> database_; // The Parent Database
362+
BaseObjectPtr<DatabaseSync> database_; // The Parent Database
363363
};
364364

365365
classSQLTagStore : publicBaseObject {
‎test/parallel/test-sqlite-session.js‎
Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Flags: --experimental-sqlite
1+
// Flags: --expose-gc --experimental-sqlite
22
'use strict';
33
const{ skipIfSQLiteMissing }=require('../common');
44
skipIfSQLiteMissing();
@@ -589,6 +589,36 @@ test('session.close() - closing twice', (t) => {
589589
});
590590
});
591591

592+
test('session - keeps its database alive after the db handle is dropped',async(t)=>{
593+
const{ gcUntil, onGC }=require('../common/gc');
594+
595+
// The DatabaseSync handle is created in a nested scope and never referenced
596+
// again, so the returned session is the only thing keeping it reachable.
597+
letdbCollected=false;
598+
constsession=(()=>{
599+
constdatabase=newDatabaseSync(':memory:');
600+
database.exec('CREATE TABLE data(key INTEGER PRIMARY KEY, value TEXT)');
601+
onGC(database,{ongc: ()=>{dbCollected=true;}});
602+
consts=database.createSession();
603+
database.exec("INSERT INTO data VALUES (1, 'hello')");
604+
returns;
605+
})();
606+
607+
// The session must keep the database alive across GC. Previously it held
608+
// only a weak reference, so the database could be collected and using the
609+
// session afterwards dereferenced a dangling pointer and crashed.
610+
awaitgcUntil('database is collected',()=>dbCollected,5).then(
611+
()=>{thrownewError('session did not keep its database alive');},
612+
()=>{},// Expected: the database is never collected, so gcUntil rejects.
613+
);
614+
t.assert.strictEqual(dbCollected,false);
615+
616+
// The database is still open and usable through the still-alive session.
617+
constchangeset=session.changeset();
618+
t.assert.ok(changeset.byteLength>0);
619+
session.close();
620+
});
621+
592622
test('session supports ERM',(t)=>{
593623
constdatabase=newDatabaseSync(':memory:');
594624
letafterDisposeSession;
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 c2a5251
Browse files
3zrvaduh95
3zrv
authored and
aduh95
committed
sqlite: fix crash when a session outlives its database
Keep the database alive while a session is open so that closing the
database before the session does not leave the session pointing at
freed memory.
Signed-off-by: Mohamed Sayed <k@3zrv.com>
PR-URL: #63797Fixes: #63796
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Edy Silva <edigleyssonsilva@gmail.com>
1 parent d7d4f0e commit c2a5251
3 files changed
Lines changed: 40 additions & 8 deletions
File tree
‎src/node_sqlite.cc‎
Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2124,7 +2124,7 @@ void DatabaseSync::CreateSession(const FunctionCallbackInfo<Value>& args) {
21242124
CHECK_ERROR_OR_THROW(env->isolate(), db, r, SQLITE_OK, void());
21252125

21262126
 BaseObjectPtr<Session> session =
2127-
Session::Create(env, BaseObjectWeakPtr<DatabaseSync>(db), pSession);
2127+
Session::Create(env, BaseObjectPtr<DatabaseSync>(db), pSession);
21282128
 args.GetReturnValue().Set(session->object());
21292129
}
21302130

@@ -3803,7 +3803,7 @@ void StatementSyncIterator::Return(const FunctionCallbackInfo<Value>& args) {
38033803

38043804
Session::Session(Environment* env,
38053805
 Local<Object> object,
3806-
BaseObjectWeakPtr<DatabaseSync> database,
3806+
BaseObjectPtr<DatabaseSync> database,
38073807
 sqlite3_session* session)
38083808
 : BaseObject(env, object),
38093809
 session_(session),
@@ -3816,7 +3816,7 @@ Session::~Session() {
38163816
}
38173817

38183818
BaseObjectPtr<Session> Session::Create(Environment* env,
3819-
BaseObjectWeakPtr<DatabaseSync> database,
3819+
BaseObjectPtr<DatabaseSync> database,
38203820
 sqlite3_session* session) {
38213821
 Local<Object> obj;
38223822
if (!GetConstructorTemplate(env)
@@ -3850,7 +3850,9 @@ Local<FunctionTemplate> Session::GetConstructorTemplate(Environment* env) {
38503850
return tmpl;
38513851
}
38523852

3853-
voidSession::MemoryInfo(MemoryTracker* tracker) const {}
3853+
voidSession::MemoryInfo(MemoryTracker* tracker) const {
3854+
 tracker->TrackField("database", database_);
3855+
}
38543856

38553857
template <Sqlite3ChangesetGenFunc sqliteChangesetFunc>
38563858
voidSession::Changeset(const FunctionCallbackInfo<Value>& args) {
‎src/node_sqlite.h‎
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ class Session : public BaseObject {
339339
public:
340340
Session(Environment* env,
341341
 v8::Local<v8::Object> object,
342-
BaseObjectWeakPtr<DatabaseSync> database,
342+
BaseObjectPtr<DatabaseSync> database,
343343
 sqlite3_session* session);
344344
~Session() override;
345345
template <Sqlite3ChangesetGenFunc sqliteChangesetFunc>
@@ -349,7 +349,7 @@ class Session : public BaseObject {
349349
static v8::Local<v8::FunctionTemplate> GetConstructorTemplate(
350350
 Environment* env);
351351
static BaseObjectPtr<Session> Create(Environment* env,
352-
BaseObjectWeakPtr<DatabaseSync> database,
352+
BaseObjectPtr<DatabaseSync> database,
353353
 sqlite3_session* session);
354354

355355
voidMemoryInfo(MemoryTracker* tracker) constoverride;
@@ -359,7 +359,7 @@ class Session : public BaseObject {
359359
private:
360360
voidDelete();
361361
 sqlite3_session* session_;
362-
BaseObjectWeakPtr<DatabaseSync> database_; // The Parent Database
362+
BaseObjectPtr<DatabaseSync> database_; // The Parent Database
363363
};
364364

365365
classSQLTagStore : publicBaseObject {
‎test/parallel/test-sqlite-session.js‎
Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Flags: --experimental-sqlite
1+
// Flags: --expose-gc --experimental-sqlite
22
'use strict';
33
const{ skipIfSQLiteMissing }=require('../common');
44
skipIfSQLiteMissing();
@@ -589,6 +589,36 @@ test('session.close() - closing twice', (t) => {
589589
});
590590
});
591591

592+
test('session - keeps its database alive after the db handle is dropped',async(t)=>{
593+
const{ gcUntil, onGC }=require('../common/gc');
594+
595+
// The DatabaseSync handle is created in a nested scope and never referenced
596+
// again, so the returned session is the only thing keeping it reachable.
597+
letdbCollected=false;
598+
constsession=(()=>{
599+
constdatabase=newDatabaseSync(':memory:');
600+
database.exec('CREATE TABLE data(key INTEGER PRIMARY KEY, value TEXT)');
601+
onGC(database,{ongc: ()=>{dbCollected=true;}});
602+
consts=database.createSession();
603+
database.exec("INSERT INTO data VALUES (1, 'hello')");
604+
returns;
605+
})();
606+
607+
// The session must keep the database alive across GC. Previously it held
608+
// only a weak reference, so the database could be collected and using the
609+
// session afterwards dereferenced a dangling pointer and crashed.
610+
awaitgcUntil('database is collected',()=>dbCollected,5).then(
611+
()=>{thrownewError('session did not keep its database alive');},
612+
()=>{},// Expected: the database is never collected, so gcUntil rejects.
613+
);
614+
t.assert.strictEqual(dbCollected,false);
615+
616+
// The database is still open and usable through the still-alive session.
617+
constchangeset=session.changeset();
618+
t.assert.ok(changeset.byteLength>0);
619+
session.close();
620+
});
621+
592622
test('session supports ERM',(t)=>{
593623
constdatabase=newDatabaseSync(':memory:');
594624
letafterDisposeSession;
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 c2a5251
Browse files
3zrvaduh95
3zrv
authored and
aduh95
committed
sqlite: fix crash when a session outlives its database
Keep the database alive while a session is open so that closing the
database before the session does not leave the session pointing at
freed memory.
Signed-off-by: Mohamed Sayed <k@3zrv.com>
PR-URL: #63797Fixes: #63796
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Edy Silva <edigleyssonsilva@gmail.com>
1 parent d7d4f0e commit c2a5251
3 files changed
Lines changed: 40 additions & 8 deletions
File tree
‎src/node_sqlite.cc‎
Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2124,7 +2124,7 @@ void DatabaseSync::CreateSession(const FunctionCallbackInfo<Value>& args) {
21242124
CHECK_ERROR_OR_THROW(env->isolate(), db, r, SQLITE_OK, void());
21252125

21262126
 BaseObjectPtr<Session> session =
2127-
Session::Create(env, BaseObjectWeakPtr<DatabaseSync>(db), pSession);
2127+
Session::Create(env, BaseObjectPtr<DatabaseSync>(db), pSession);
21282128
 args.GetReturnValue().Set(session->object());
21292129
}
21302130

@@ -3803,7 +3803,7 @@ void StatementSyncIterator::Return(const FunctionCallbackInfo<Value>& args) {
38033803

38043804
Session::Session(Environment* env,
38053805
 Local<Object> object,
3806-
BaseObjectWeakPtr<DatabaseSync> database,
3806+
BaseObjectPtr<DatabaseSync> database,
38073807
 sqlite3_session* session)
38083808
 : BaseObject(env, object),
38093809
 session_(session),
@@ -3816,7 +3816,7 @@ Session::~Session() {
38163816
}
38173817

38183818
BaseObjectPtr<Session> Session::Create(Environment* env,
3819-
BaseObjectWeakPtr<DatabaseSync> database,
3819+
BaseObjectPtr<DatabaseSync> database,
38203820
 sqlite3_session* session) {
38213821
 Local<Object> obj;
38223822
if (!GetConstructorTemplate(env)
@@ -3850,7 +3850,9 @@ Local<FunctionTemplate> Session::GetConstructorTemplate(Environment* env) {
38503850
return tmpl;
38513851
}
38523852

3853-
voidSession::MemoryInfo(MemoryTracker* tracker) const {}
3853+
voidSession::MemoryInfo(MemoryTracker* tracker) const {
3854+
 tracker->TrackField("database", database_);
3855+
}
38543856

38553857
template <Sqlite3ChangesetGenFunc sqliteChangesetFunc>
38563858
voidSession::Changeset(const FunctionCallbackInfo<Value>& args) {
‎src/node_sqlite.h‎
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ class Session : public BaseObject {
339339
public:
340340
Session(Environment* env,
341341
 v8::Local<v8::Object> object,
342-
BaseObjectWeakPtr<DatabaseSync> database,
342+
BaseObjectPtr<DatabaseSync> database,
343343
 sqlite3_session* session);
344344
~Session() override;
345345
template <Sqlite3ChangesetGenFunc sqliteChangesetFunc>
@@ -349,7 +349,7 @@ class Session : public BaseObject {
349349
static v8::Local<v8::FunctionTemplate> GetConstructorTemplate(
350350
 Environment* env);
351351
static BaseObjectPtr<Session> Create(Environment* env,
352-
BaseObjectWeakPtr<DatabaseSync> database,
352+
BaseObjectPtr<DatabaseSync> database,
353353
 sqlite3_session* session);
354354

355355
voidMemoryInfo(MemoryTracker* tracker) constoverride;
@@ -359,7 +359,7 @@ class Session : public BaseObject {
359359
private:
360360
voidDelete();
361361
 sqlite3_session* session_;
362-
BaseObjectWeakPtr<DatabaseSync> database_; // The Parent Database
362+
BaseObjectPtr<DatabaseSync> database_; // The Parent Database
363363
};
364364

365365
classSQLTagStore : publicBaseObject {
‎test/parallel/test-sqlite-session.js‎
Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Flags: --experimental-sqlite
1+
// Flags: --expose-gc --experimental-sqlite
22
'use strict';
33
const{ skipIfSQLiteMissing }=require('../common');
44
skipIfSQLiteMissing();
@@ -589,6 +589,36 @@ test('session.close() - closing twice', (t) => {
589589
});
590590
});
591591

592+
test('session - keeps its database alive after the db handle is dropped',async(t)=>{
593+
const{ gcUntil, onGC }=require('../common/gc');
594+
595+
// The DatabaseSync handle is created in a nested scope and never referenced
596+
// again, so the returned session is the only thing keeping it reachable.
597+
letdbCollected=false;
598+
constsession=(()=>{
599+
constdatabase=newDatabaseSync(':memory:');
600+
database.exec('CREATE TABLE data(key INTEGER PRIMARY KEY, value TEXT)');
601+
onGC(database,{ongc: ()=>{dbCollected=true;}});
602+
consts=database.createSession();
603+
database.exec("INSERT INTO data VALUES (1, 'hello')");
604+
returns;
605+
})();
606+
607+
// The session must keep the database alive across GC. Previously it held
608+
// only a weak reference, so the database could be collected and using the
609+
// session afterwards dereferenced a dangling pointer and crashed.
610+
awaitgcUntil('database is collected',()=>dbCollected,5).then(
611+
()=>{thrownewError('session did not keep its database alive');},
612+
()=>{},// Expected: the database is never collected, so gcUntil rejects.
613+
);
614+
t.assert.strictEqual(dbCollected,false);
615+
616+
// The database is still open and usable through the still-alive session.
617+
constchangeset=session.changeset();
618+
t.assert.ok(changeset.byteLength>0);
619+
session.close();
620+
});
621+
592622
test('session supports ERM',(t)=>{
593623
constdatabase=newDatabaseSync(':memory:');
594624
letafterDisposeSession;
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 c2a5251
Browse files
3zrvaduh95
3zrv
authored and
aduh95
committed
sqlite: fix crash when a session outlives its database
Keep the database alive while a session is open so that closing the
database before the session does not leave the session pointing at
freed memory.
Signed-off-by: Mohamed Sayed <k@3zrv.com>
PR-URL: #63797Fixes: #63796
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Edy Silva <edigleyssonsilva@gmail.com>
1 parent d7d4f0e commit c2a5251
3 files changed
Lines changed: 40 additions & 8 deletions
File tree
‎src/node_sqlite.cc‎
Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2124,7 +2124,7 @@ void DatabaseSync::CreateSession(const FunctionCallbackInfo<Value>& args) {
21242124
CHECK_ERROR_OR_THROW(env->isolate(), db, r, SQLITE_OK, void());
21252125

21262126
 BaseObjectPtr<Session> session =
2127-
Session::Create(env, BaseObjectWeakPtr<DatabaseSync>(db), pSession);
2127+
Session::Create(env, BaseObjectPtr<DatabaseSync>(db), pSession);
21282128
 args.GetReturnValue().Set(session->object());
21292129
}
21302130

@@ -3803,7 +3803,7 @@ void StatementSyncIterator::Return(const FunctionCallbackInfo<Value>& args) {
38033803

38043804
Session::Session(Environment* env,
38053805
 Local<Object> object,
3806-
BaseObjectWeakPtr<DatabaseSync> database,
3806+
BaseObjectPtr<DatabaseSync> database,
38073807
 sqlite3_session* session)
38083808
 : BaseObject(env, object),
38093809
 session_(session),
@@ -3816,7 +3816,7 @@ Session::~Session() {
38163816
}
38173817

38183818
BaseObjectPtr<Session> Session::Create(Environment* env,
3819-
BaseObjectWeakPtr<DatabaseSync> database,
3819+
BaseObjectPtr<DatabaseSync> database,
38203820
 sqlite3_session* session) {
38213821
 Local<Object> obj;
38223822
if (!GetConstructorTemplate(env)
@@ -3850,7 +3850,9 @@ Local<FunctionTemplate> Session::GetConstructorTemplate(Environment* env) {
38503850
return tmpl;
38513851
}
38523852

3853-
voidSession::MemoryInfo(MemoryTracker* tracker) const {}
3853+
voidSession::MemoryInfo(MemoryTracker* tracker) const {
3854+
 tracker->TrackField("database", database_);
3855+
}
38543856

38553857
template <Sqlite3ChangesetGenFunc sqliteChangesetFunc>
38563858
voidSession::Changeset(const FunctionCallbackInfo<Value>& args) {
‎src/node_sqlite.h‎
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ class Session : public BaseObject {
339339
public:
340340
Session(Environment* env,
341341
 v8::Local<v8::Object> object,
342-
BaseObjectWeakPtr<DatabaseSync> database,
342+
BaseObjectPtr<DatabaseSync> database,
343343
 sqlite3_session* session);
344344
~Session() override;
345345
template <Sqlite3ChangesetGenFunc sqliteChangesetFunc>
@@ -349,7 +349,7 @@ class Session : public BaseObject {
349349
static v8::Local<v8::FunctionTemplate> GetConstructorTemplate(
350350
 Environment* env);
351351
static BaseObjectPtr<Session> Create(Environment* env,
352-
BaseObjectWeakPtr<DatabaseSync> database,
352+
BaseObjectPtr<DatabaseSync> database,
353353
 sqlite3_session* session);
354354

355355
voidMemoryInfo(MemoryTracker* tracker) constoverride;
@@ -359,7 +359,7 @@ class Session : public BaseObject {
359359
private:
360360
voidDelete();
361361
 sqlite3_session* session_;
362-
BaseObjectWeakPtr<DatabaseSync> database_; // The Parent Database
362+
BaseObjectPtr<DatabaseSync> database_; // The Parent Database
363363
};
364364

365365
classSQLTagStore : publicBaseObject {
‎test/parallel/test-sqlite-session.js‎
Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Flags: --experimental-sqlite
1+
// Flags: --expose-gc --experimental-sqlite
22
'use strict';
33
const{ skipIfSQLiteMissing }=require('../common');
44
skipIfSQLiteMissing();
@@ -589,6 +589,36 @@ test('session.close() - closing twice', (t) => {
589589
});
590590
});
591591

592+
test('session - keeps its database alive after the db handle is dropped',async(t)=>{
593+
const{ gcUntil, onGC }=require('../common/gc');
594+
595+
// The DatabaseSync handle is created in a nested scope and never referenced
596+
// again, so the returned session is the only thing keeping it reachable.
597+
letdbCollected=false;
598+
constsession=(()=>{
599+
constdatabase=newDatabaseSync(':memory:');
600+
database.exec('CREATE TABLE data(key INTEGER PRIMARY KEY, value TEXT)');
601+
onGC(database,{ongc: ()=>{dbCollected=true;}});
602+
consts=database.createSession();
603+
database.exec("INSERT INTO data VALUES (1, 'hello')");
604+
returns;
605+
})();
606+
607+
// The session must keep the database alive across GC. Previously it held
608+
// only a weak reference, so the database could be collected and using the
609+
// session afterwards dereferenced a dangling pointer and crashed.
610+
awaitgcUntil('database is collected',()=>dbCollected,5).then(
611+
()=>{thrownewError('session did not keep its database alive');},
612+
()=>{},// Expected: the database is never collected, so gcUntil rejects.
613+
);
614+
t.assert.strictEqual(dbCollected,false);
615+
616+
// The database is still open and usable through the still-alive session.
617+
constchangeset=session.changeset();
618+
t.assert.ok(changeset.byteLength>0);
619+
session.close();
620+
});
621+
592622
test('session supports ERM',(t)=>{
593623
constdatabase=newDatabaseSync(':memory:');
594624
letafterDisposeSession;
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 c2a5251
Browse files
3zrvaduh95
3zrv
authored and
aduh95
committed
sqlite: fix crash when a session outlives its database
Keep the database alive while a session is open so that closing the
database before the session does not leave the session pointing at
freed memory.
Signed-off-by: Mohamed Sayed <k@3zrv.com>
PR-URL: #63797Fixes: #63796
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Edy Silva <edigleyssonsilva@gmail.com>
1 parent d7d4f0e commit c2a5251
3 files changed
Lines changed: 40 additions & 8 deletions
File tree
‎src/node_sqlite.cc‎
Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2124,7 +2124,7 @@ void DatabaseSync::CreateSession(const FunctionCallbackInfo<Value>& args) {
21242124
CHECK_ERROR_OR_THROW(env->isolate(), db, r, SQLITE_OK, void());
21252125

21262126
 BaseObjectPtr<Session> session =
2127-
Session::Create(env, BaseObjectWeakPtr<DatabaseSync>(db), pSession);
2127+
Session::Create(env, BaseObjectPtr<DatabaseSync>(db), pSession);
21282128
 args.GetReturnValue().Set(session->object());
21292129
}
21302130

@@ -3803,7 +3803,7 @@ void StatementSyncIterator::Return(const FunctionCallbackInfo<Value>& args) {
38033803

38043804
Session::Session(Environment* env,
38053805
 Local<Object> object,
3806-
BaseObjectWeakPtr<DatabaseSync> database,
3806+
BaseObjectPtr<DatabaseSync> database,
38073807
 sqlite3_session* session)
38083808
 : BaseObject(env, object),
38093809
 session_(session),
@@ -3816,7 +3816,7 @@ Session::~Session() {
38163816
}
38173817

38183818
BaseObjectPtr<Session> Session::Create(Environment* env,
3819-
BaseObjectWeakPtr<DatabaseSync> database,
3819+
BaseObjectPtr<DatabaseSync> database,
38203820
 sqlite3_session* session) {
38213821
 Local<Object> obj;
38223822
if (!GetConstructorTemplate(env)
@@ -3850,7 +3850,9 @@ Local<FunctionTemplate> Session::GetConstructorTemplate(Environment* env) {
38503850
return tmpl;
38513851
}
38523852

3853-
voidSession::MemoryInfo(MemoryTracker* tracker) const {}
3853+
voidSession::MemoryInfo(MemoryTracker* tracker) const {
3854+
 tracker->TrackField("database", database_);
3855+
}
38543856

38553857
template <Sqlite3ChangesetGenFunc sqliteChangesetFunc>
38563858
voidSession::Changeset(const FunctionCallbackInfo<Value>& args) {
‎src/node_sqlite.h‎
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ class Session : public BaseObject {
339339
public:
340340
Session(Environment* env,
341341
 v8::Local<v8::Object> object,
342-
BaseObjectWeakPtr<DatabaseSync> database,
342+
BaseObjectPtr<DatabaseSync> database,
343343
 sqlite3_session* session);
344344
~Session() override;
345345
template <Sqlite3ChangesetGenFunc sqliteChangesetFunc>
@@ -349,7 +349,7 @@ class Session : public BaseObject {
349349
static v8::Local<v8::FunctionTemplate> GetConstructorTemplate(
350350
 Environment* env);
351351
static BaseObjectPtr<Session> Create(Environment* env,
352-
BaseObjectWeakPtr<DatabaseSync> database,
352+
BaseObjectPtr<DatabaseSync> database,
353353
 sqlite3_session* session);
354354

355355
voidMemoryInfo(MemoryTracker* tracker) constoverride;
@@ -359,7 +359,7 @@ class Session : public BaseObject {
359359
private:
360360
voidDelete();
361361
 sqlite3_session* session_;
362-
BaseObjectWeakPtr<DatabaseSync> database_; // The Parent Database
362+
BaseObjectPtr<DatabaseSync> database_; // The Parent Database
363363
};
364364

365365
classSQLTagStore : publicBaseObject {
‎test/parallel/test-sqlite-session.js‎
Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Flags: --experimental-sqlite
1+
// Flags: --expose-gc --experimental-sqlite
22
'use strict';
33
const{ skipIfSQLiteMissing }=require('../common');
44
skipIfSQLiteMissing();
@@ -589,6 +589,36 @@ test('session.close() - closing twice', (t) => {
589589
});
590590
});
591591

592+
test('session - keeps its database alive after the db handle is dropped',async(t)=>{
593+
const{ gcUntil, onGC }=require('../common/gc');
594+
595+
// The DatabaseSync handle is created in a nested scope and never referenced
596+
// again, so the returned session is the only thing keeping it reachable.
597+
letdbCollected=false;
598+
constsession=(()=>{
599+
constdatabase=newDatabaseSync(':memory:');
600+
database.exec('CREATE TABLE data(key INTEGER PRIMARY KEY, value TEXT)');
601+
onGC(database,{ongc: ()=>{dbCollected=true;}});
602+
consts=database.createSession();
603+
database.exec("INSERT INTO data VALUES (1, 'hello')");
604+
returns;
605+
})();
606+
607+
// The session must keep the database alive across GC. Previously it held
608+
// only a weak reference, so the database could be collected and using the
609+
// session afterwards dereferenced a dangling pointer and crashed.
610+
awaitgcUntil('database is collected',()=>dbCollected,5).then(
611+
()=>{thrownewError('session did not keep its database alive');},
612+
()=>{},// Expected: the database is never collected, so gcUntil rejects.
613+
);
614+
t.assert.strictEqual(dbCollected,false);
615+
616+
// The database is still open and usable through the still-alive session.
617+
constchangeset=session.changeset();
618+
t.assert.ok(changeset.byteLength>0);
619+
session.close();
620+
});
621+
592622
test('session supports ERM',(t)=>{
593623
constdatabase=newDatabaseSync(':memory:');
594624
letafterDisposeSession;
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 c2a5251
Browse files
3zrvaduh95
3zrv
authored and
aduh95
committed
sqlite: fix crash when a session outlives its database
Keep the database alive while a session is open so that closing the
database before the session does not leave the session pointing at
freed memory.
Signed-off-by: Mohamed Sayed <k@3zrv.com>
PR-URL: #63797Fixes: #63796
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Edy Silva <edigleyssonsilva@gmail.com>
1 parent d7d4f0e commit c2a5251
3 files changed
Lines changed: 40 additions & 8 deletions
File tree
‎src/node_sqlite.cc‎
Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2124,7 +2124,7 @@ void DatabaseSync::CreateSession(const FunctionCallbackInfo<Value>& args) {
21242124
CHECK_ERROR_OR_THROW(env->isolate(), db, r, SQLITE_OK, void());
21252125

21262126
 BaseObjectPtr<Session> session =
2127-
Session::Create(env, BaseObjectWeakPtr<DatabaseSync>(db), pSession);
2127+
Session::Create(env, BaseObjectPtr<DatabaseSync>(db), pSession);
21282128
 args.GetReturnValue().Set(session->object());
21292129
}
21302130

@@ -3803,7 +3803,7 @@ void StatementSyncIterator::Return(const FunctionCallbackInfo<Value>& args) {
38033803

38043804
Session::Session(Environment* env,
38053805
 Local<Object> object,
3806-
BaseObjectWeakPtr<DatabaseSync> database,
3806+
BaseObjectPtr<DatabaseSync> database,
38073807
 sqlite3_session* session)
38083808
 : BaseObject(env, object),
38093809
 session_(session),
@@ -3816,7 +3816,7 @@ Session::~Session() {
38163816
}
38173817

38183818
BaseObjectPtr<Session> Session::Create(Environment* env,
3819-
BaseObjectWeakPtr<DatabaseSync> database,
3819+
BaseObjectPtr<DatabaseSync> database,
38203820
 sqlite3_session* session) {
38213821
 Local<Object> obj;
38223822
if (!GetConstructorTemplate(env)
@@ -3850,7 +3850,9 @@ Local<FunctionTemplate> Session::GetConstructorTemplate(Environment* env) {
38503850
return tmpl;
38513851
}
38523852

3853-
voidSession::MemoryInfo(MemoryTracker* tracker) const {}
3853+
voidSession::MemoryInfo(MemoryTracker* tracker) const {
3854+
 tracker->TrackField("database", database_);
3855+
}
38543856

38553857
template <Sqlite3ChangesetGenFunc sqliteChangesetFunc>
38563858
voidSession::Changeset(const FunctionCallbackInfo<Value>& args) {
‎src/node_sqlite.h‎
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ class Session : public BaseObject {
339339
public:
340340
Session(Environment* env,
341341
 v8::Local<v8::Object> object,
342-
BaseObjectWeakPtr<DatabaseSync> database,
342+
BaseObjectPtr<DatabaseSync> database,
343343
 sqlite3_session* session);
344344
~Session() override;
345345
template <Sqlite3ChangesetGenFunc sqliteChangesetFunc>
@@ -349,7 +349,7 @@ class Session : public BaseObject {
349349
static v8::Local<v8::FunctionTemplate> GetConstructorTemplate(
350350
 Environment* env);
351351
static BaseObjectPtr<Session> Create(Environment* env,
352-
BaseObjectWeakPtr<DatabaseSync> database,
352+
BaseObjectPtr<DatabaseSync> database,
353353
 sqlite3_session* session);
354354

355355
voidMemoryInfo(MemoryTracker* tracker) constoverride;
@@ -359,7 +359,7 @@ class Session : public BaseObject {
359359
private:
360360
voidDelete();
361361
 sqlite3_session* session_;
362-
BaseObjectWeakPtr<DatabaseSync> database_; // The Parent Database
362+
BaseObjectPtr<DatabaseSync> database_; // The Parent Database
363363
};
364364

365365
classSQLTagStore : publicBaseObject {
‎test/parallel/test-sqlite-session.js‎
Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Flags: --experimental-sqlite
1+
// Flags: --expose-gc --experimental-sqlite
22
'use strict';
33
const{ skipIfSQLiteMissing }=require('../common');
44
skipIfSQLiteMissing();
@@ -589,6 +589,36 @@ test('session.close() - closing twice', (t) => {
589589
});
590590
});
591591

592+
test('session - keeps its database alive after the db handle is dropped',async(t)=>{
593+
const{ gcUntil, onGC }=require('../common/gc');
594+
595+
// The DatabaseSync handle is created in a nested scope and never referenced
596+
// again, so the returned session is the only thing keeping it reachable.
597+
letdbCollected=false;
598+
constsession=(()=>{
599+
constdatabase=newDatabaseSync(':memory:');
600+
database.exec('CREATE TABLE data(key INTEGER PRIMARY KEY, value TEXT)');
601+
onGC(database,{ongc: ()=>{dbCollected=true;}});
602+
consts=database.createSession();
603+
database.exec("INSERT INTO data VALUES (1, 'hello')");
604+
returns;
605+
})();
606+
607+
// The session must keep the database alive across GC. Previously it held
608+
// only a weak reference, so the database could be collected and using the
609+
// session afterwards dereferenced a dangling pointer and crashed.
610+
awaitgcUntil('database is collected',()=>dbCollected,5).then(
611+
()=>{thrownewError('session did not keep its database alive');},
612+
()=>{},// Expected: the database is never collected, so gcUntil rejects.
613+
);
614+
t.assert.strictEqual(dbCollected,false);
615+
616+
// The database is still open and usable through the still-alive session.
617+
constchangeset=session.changeset();
618+
t.assert.ok(changeset.byteLength>0);
619+
session.close();
620+
});
621+
592622
test('session supports ERM',(t)=>{
593623
constdatabase=newDatabaseSync(':memory:');
594624
letafterDisposeSession;
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 c2a5251
Browse files
3zrvaduh95
3zrv
authored and
aduh95
committed
sqlite: fix crash when a session outlives its database
Keep the database alive while a session is open so that closing the
database before the session does not leave the session pointing at
freed memory.
Signed-off-by: Mohamed Sayed <k@3zrv.com>
PR-URL: #63797Fixes: #63796
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Edy Silva <edigleyssonsilva@gmail.com>
1 parent d7d4f0e commit c2a5251
3 files changed
Lines changed: 40 additions & 8 deletions
File tree
‎src/node_sqlite.cc‎
Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2124,7 +2124,7 @@ void DatabaseSync::CreateSession(const FunctionCallbackInfo<Value>& args) {
21242124
CHECK_ERROR_OR_THROW(env->isolate(), db, r, SQLITE_OK, void());
21252125

21262126
 BaseObjectPtr<Session> session =
2127-
Session::Create(env, BaseObjectWeakPtr<DatabaseSync>(db), pSession);
2127+
Session::Create(env, BaseObjectPtr<DatabaseSync>(db), pSession);
21282128
 args.GetReturnValue().Set(session->object());
21292129
}
21302130

@@ -3803,7 +3803,7 @@ void StatementSyncIterator::Return(const FunctionCallbackInfo<Value>& args) {
38033803

38043804
Session::Session(Environment* env,
38053805
 Local<Object> object,
3806-
BaseObjectWeakPtr<DatabaseSync> database,
3806+
BaseObjectPtr<DatabaseSync> database,
38073807
 sqlite3_session* session)
38083808
 : BaseObject(env, object),
38093809
 session_(session),
@@ -3816,7 +3816,7 @@ Session::~Session() {
38163816
}
38173817

38183818
BaseObjectPtr<Session> Session::Create(Environment* env,
3819-
BaseObjectWeakPtr<DatabaseSync> database,
3819+
BaseObjectPtr<DatabaseSync> database,
38203820
 sqlite3_session* session) {
38213821
 Local<Object> obj;
38223822
if (!GetConstructorTemplate(env)
@@ -3850,7 +3850,9 @@ Local<FunctionTemplate> Session::GetConstructorTemplate(Environment* env) {
38503850
return tmpl;
38513851
}
38523852

3853-
voidSession::MemoryInfo(MemoryTracker* tracker) const {}
3853+
voidSession::MemoryInfo(MemoryTracker* tracker) const {
3854+
 tracker->TrackField("database", database_);
3855+
}
38543856

38553857
template <Sqlite3ChangesetGenFunc sqliteChangesetFunc>
38563858
voidSession::Changeset(const FunctionCallbackInfo<Value>& args) {
‎src/node_sqlite.h‎
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ class Session : public BaseObject {
339339
public:
340340
Session(Environment* env,
341341
 v8::Local<v8::Object> object,
342-
BaseObjectWeakPtr<DatabaseSync> database,
342+
BaseObjectPtr<DatabaseSync> database,
343343
 sqlite3_session* session);
344344
~Session() override;
345345
template <Sqlite3ChangesetGenFunc sqliteChangesetFunc>
@@ -349,7 +349,7 @@ class Session : public BaseObject {
349349
static v8::Local<v8::FunctionTemplate> GetConstructorTemplate(
350350
 Environment* env);
351351
static BaseObjectPtr<Session> Create(Environment* env,
352-
BaseObjectWeakPtr<DatabaseSync> database,
352+
BaseObjectPtr<DatabaseSync> database,
353353
 sqlite3_session* session);
354354

355355
voidMemoryInfo(MemoryTracker* tracker) constoverride;
@@ -359,7 +359,7 @@ class Session : public BaseObject {
359359
private:
360360
voidDelete();
361361
 sqlite3_session* session_;
362-
BaseObjectWeakPtr<DatabaseSync> database_; // The Parent Database
362+
BaseObjectPtr<DatabaseSync> database_; // The Parent Database
363363
};
364364

365365
classSQLTagStore : publicBaseObject {
‎test/parallel/test-sqlite-session.js‎
Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Flags: --experimental-sqlite
1+
// Flags: --expose-gc --experimental-sqlite
22
'use strict';
33
const{ skipIfSQLiteMissing }=require('../common');
44
skipIfSQLiteMissing();
@@ -589,6 +589,36 @@ test('session.close() - closing twice', (t) => {
589589
});
590590
});
591591

592+
test('session - keeps its database alive after the db handle is dropped',async(t)=>{
593+
const{ gcUntil, onGC }=require('../common/gc');
594+
595+
// The DatabaseSync handle is created in a nested scope and never referenced
596+
// again, so the returned session is the only thing keeping it reachable.
597+
letdbCollected=false;
598+
constsession=(()=>{
599+
constdatabase=newDatabaseSync(':memory:');
600+
database.exec('CREATE TABLE data(key INTEGER PRIMARY KEY, value TEXT)');
601+
onGC(database,{ongc: ()=>{dbCollected=true;}});
602+
consts=database.createSession();
603+
database.exec("INSERT INTO data VALUES (1, 'hello')");
604+
returns;
605+
})();
606+
607+
// The session must keep the database alive across GC. Previously it held
608+
// only a weak reference, so the database could be collected and using the
609+
// session afterwards dereferenced a dangling pointer and crashed.
610+
awaitgcUntil('database is collected',()=>dbCollected,5).then(
611+
()=>{thrownewError('session did not keep its database alive');},
612+
()=>{},// Expected: the database is never collected, so gcUntil rejects.
613+
);
614+
t.assert.strictEqual(dbCollected,false);
615+
616+
// The database is still open and usable through the still-alive session.
617+
constchangeset=session.changeset();
618+
t.assert.ok(changeset.byteLength>0);
619+
session.close();
620+
});
621+
592622
test('session supports ERM',(t)=>{
593623
constdatabase=newDatabaseSync(':memory:');
594624
letafterDisposeSession;
0 commit comments
Comments
 (0)