Skip to content

Fix memory management for postgres in edge cases #89

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

Merged
liuzicheng1987 merged 1 commit into from
Nov 14, 2025
Merged

Fix memory management for postgres in edge cases #89

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/sqlgen/postgres/Connection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,11 @@ Result<Nothing> Connection::end_write() {
}
const auto res = PQgetResult(conn_.get());
if (PQresultStatus(res) != PGRES_COMMAND_OK) {
return error(PQerrorMessage(conn_.get()));
const auto err = error(PQerrorMessage(conn_.get()));
PQclear(res);
return err;
}
PQclear(res);
return Nothing{};
}

Expand Down Expand Up @@ -68,6 +71,7 @@ Result<Nothing> Connection::insert_impl(
const auto& d = _data[i];

if (d.size() != current_row.size()) {
execute("ROLLBACK;");
execute("DEALLOCATE " + name + ";");
return error("Error in entry " + std::to_string(i) + ": Expected " +
std::to_string(current_row.size()) + " entries, got " +
Expand All @@ -88,13 +92,15 @@ Result<Nothing> Connection::insert_impl(
);

const auto status = PQresultStatus(res);

if (status != PGRES_COMMAND_OK) {
PQclear(res);
const auto err = error(std::string("Executing INSERT failed: ") +
PQresultErrorMessage(res));
execute("ROLLBACK;");
execute("DEALLOCATE " + name + ";");
return err;
}
PQclear(res);
}

return execute("DEALLOCATE " + name + ";");
Expand Down Expand Up @@ -170,6 +176,9 @@ Result<Nothing> Connection::write_impl(
static_cast<int>(buffer.size()));
if (success != 1) {
PQputCopyEnd(conn_.get(), NULL);
while (auto res = PQgetResult(conn_.get()))
PQclear(res);

return error("Error occurred while writing data to postgres.");
}
}
Expand Down
5 changes: 4 additions & 1 deletion src/sqlgen/postgres/exec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace sqlgen::postgres {

Result<Ref<PGresult>> exec(const Ref<PGconn>& _conn,
const std::string& _sql) noexcept {
const auto res = PQexec(_conn.get(), _sql.c_str());
auto res = PQexec(_conn.get(), _sql.c_str());

const auto status = PQresultStatus(res);

Expand All @@ -18,6 +18,9 @@ Result<Ref<PGresult>> exec(const Ref<PGconn>& _conn,
const auto err =
error("Executing '" + _sql + "' failed: " + PQresultErrorMessage(res));
PQclear(res);
while ((res = PQgetResult(_conn.get())) != nullptr)
PQclear(res);

return err;
}

Expand Down
Loading