Skip to content

postgres: release the speculative query ref on every do_run error exit #32426

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Closed
alii wants to merge 2 commits into from
Closed

postgres: release the speculative query ref on every do_run error exit #32426

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d950c24
postgres: release the speculative query ref on every do_run error exit
alii Jun 16, 2026
d466a24
Merge branch 'main' into ali/postgres-dorun-ref-leaks
alii Jun 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
101 changes: 36 additions & 65 deletions src/sql_jsc/postgres/PostgresSQLQuery.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,6 +501,26 @@ impl PostgresSQLQuery {
let writer = connection.writer();
// We need a strong reference to the query so that it doesn't get GC'd
this.ref_();
// Shared cleanup for every error-return path below: drop any statement
// ref this query took plus the speculative `ref_()` above.
let release_query_ref = || {
this.release_statement();
// SAFETY: undoes the speculative `this.ref_()` above; count was ≥2, never frees here.
unsafe { Self::deref(this_ptr) };
};
// Shared error tail: throw `err` as a postgres error unless an exception
// is already pending.
let throw_write_error = |msg: &[u8], err: AnyPostgresError| -> JsError {
if !global_object.has_exception() {
return global_object.throw_value(postgres_error_to_js(
global_object,
Some(msg),
err,
));
}
JsError::Thrown
};

if this.flags.get().simple {
bun_core::scoped_log!(Postgres, "executeQuery");

Expand All @@ -520,20 +540,8 @@ impl PostgresSQLQuery {
let can_execute = !connection.has_query_running();
if can_execute {
if let Err(err) = PostgresRequest::execute_query(query_str.slice(), writer) {
// fail to run do cleanup — sole owner just created above
// (rc=1); `release_statement` decrements → 0 frees.
this.release_statement();
// SAFETY: undoes the speculative `this.ref_()` above; count was ≥2, never frees here.
unsafe { Self::deref(this_ptr) };

if !global_object.has_exception() {
return Err(global_object.throw_value(postgres_error_to_js(
global_object,
Some(b"failed to execute query"),
err,
)));
}
return Err(JsError::Thrown);
release_query_ref();
return Err(throw_write_error(b"failed to execute query", err));
}
{
let mut f = connection.flags.get();
Expand All @@ -552,12 +560,7 @@ impl PostgresSQLQuery {
.with_mut(|q| q.write_item(this_ptr))
.is_err()
{
// fail to run do cleanup — sole owner just created above
// (rc=1); `release_statement` decrements → 0 frees.
this.release_statement();
// SAFETY: undoes the speculative `this.ref_()` above; count was ≥2, never frees here.
unsafe { Self::deref(this_ptr) };

release_query_ref();
return Err(global_object.throw_out_of_memory());
}

Expand Down Expand Up @@ -630,6 +633,7 @@ impl PostgresSQLQuery {
Ok(v) => v,
Err(err) => {
drop(signature);
release_query_ref();
return Err(
global_object.throw_error(err.into(), "failed to allocate statement")
);
Expand Down Expand Up @@ -670,21 +674,11 @@ impl PostgresSQLQuery {
columns_value,
writer,
) {
// fail to run do cleanup — drop the ref we took above.
this.release_statement();
// SAFETY: undoes the speculative `this.ref_()` above; count was ≥2, never frees here.
unsafe { Self::deref(this_ptr) };

if !global_object.has_exception() {
return Err(global_object.throw_value(
postgres_error_to_js(
global_object,
Some(b"failed to bind and execute query"),
err,
),
));
}
return Err(JsError::Thrown);
release_query_ref();
return Err(throw_write_error(
b"failed to bind and execute query",
err,
));
}
{
let mut f = connection.flags.get();
Expand Down Expand Up @@ -726,17 +720,8 @@ impl PostgresSQLQuery {
.with_mut(|m| m.remove(&signature_hash));
}
drop(signature);
this.release_statement();
// SAFETY: undoes the speculative `this.ref_()` above; count was ≥2, never frees here.
unsafe { Self::deref(this_ptr) };
if !global_object.has_exception() {
return Err(global_object.throw_value(postgres_error_to_js(
global_object,
Some(b"failed to prepare and query"),
err,
)));
}
return Err(JsError::Thrown);
release_query_ref();
return Err(throw_write_error(b"failed to prepare and query", err));
}
{
let mut f = connection.flags.get();
Expand Down Expand Up @@ -767,17 +752,8 @@ impl PostgresSQLQuery {
.with_mut(|m| m.remove(&signature_hash));
}
drop(signature);
this.release_statement();
// SAFETY: undoes the speculative `this.ref_()` above; count was ≥2, never frees here.
unsafe { Self::deref(this_ptr) };
if !global_object.has_exception() {
return Err(global_object.throw_value(postgres_error_to_js(
global_object,
Some(b"failed to write query"),
err,
)));
}
return Err(JsError::Thrown);
release_query_ref();
return Err(throw_write_error(b"failed to write query", err));
}
if let Err(err) = writer.write(&protocol::SYNC) {
if connection_entry_value.is_some() {
Expand All @@ -786,14 +762,8 @@ impl PostgresSQLQuery {
.with_mut(|m| m.remove(&signature_hash));
}
drop(signature);
if !global_object.has_exception() {
return Err(global_object.throw_value(postgres_error_to_js(
global_object,
Some(b"failed to flush"),
err,
)));
}
return Err(JsError::Thrown);
release_query_ref();
return Err(throw_write_error(b"failed to flush", err));
}
{
let mut f = connection.flags.get();
Expand Down Expand Up @@ -854,6 +824,7 @@ impl PostgresSQLQuery {
.with_mut(|q| q.write_item(this_ptr))
.is_err()
{
release_query_ref();
return Err(global_object.throw_out_of_memory());
}
this.this_value.with_mut(|r| r.upgrade(global_object));
Expand Down
Loading