Skip to content

Ensure conninfo is a valid C string before closing the connection #710

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
larskanis merged 1 commit into from
Jun 5, 2026
+9 −1
Merged

Ensure conninfo is a valid C string before closing the connection #710

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
5 changes: 4 additions & 1 deletion ext/pg_connection.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,13 +568,16 @@ static VALUE
pgconn_reset_start2( VALUE self, VALUE conninfo )
{
t_pg_connection *this = pg_get_connection( self );
/* Ensure conninfo is a valid C string before closing the connection. */
char *p_conninfo = StringValueCStr(conninfo);

/* Close old connection */
pgconn_close_socket_io( self );
PQfinish( this->pgconn );
this->pgconn = NULL; /* Ensure no double free can happen. */

/* Start new connection */
this->pgconn = gvl_PQconnectStart( StringValueCStr(conninfo) );
this->pgconn = gvl_PQconnectStart( p_conninfo );

if( this->pgconn == NULL )
rb_raise(rb_ePGerror, "PQconnectStart() unable to allocate PGconn structure");
Expand Down
5 changes: 5 additions & 0 deletions spec/pg/connection_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1871,6 +1871,11 @@
end.to raise_error(PG::Error)
end

it "reset with invalid conninfo doesn't close the connection" do
expect{ @conn.send(:reset_start2, "\0") }.to raise_error(ArgumentError)
expect( @conn.exec("SELECT 1").values ).to eq([["1"]])
end


it "closes the IO fetched from #socket_io when the connection is closed", :without_transaction do
conn = PG.connect( @conninfo )
Expand Down
Loading