Skip to content

Avoid possibility to replace typemap while being used #708

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
+25 −12
Merged

Avoid possibility to replace typemap while being used #708

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
25 changes: 17 additions & 8 deletions ext/pg_copy_coder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,12 +221,13 @@ pg_text_enc_copy_row(t_pg_coder *conv, VALUE value, char *out, VALUE *intermedia
t_pg_coder_enc_func enc_func;
static t_pg_coder *p_elem_coder;
int i;
VALUE rb_typemap = this->typemap;
t_typemap *p_typemap;
char *current_out;
char *end_capa_ptr;

p_typemap = RTYPEDDATA_DATA( this->typemap );
p_typemap->funcs.fit_to_query( this->typemap, value );
p_typemap = RTYPEDDATA_DATA( rb_typemap );
p_typemap->funcs.fit_to_query( rb_typemap, value );

/* Allocate a new string with embedded capacity and realloc exponential when needed. */
PG_RB_STR_NEW( *intermediate, current_out, end_capa_ptr );
Expand Down Expand Up @@ -314,6 +315,7 @@ pg_text_enc_copy_row(t_pg_coder *conv, VALUE value, char *out, VALUE *intermedia

rb_str_set_len( *intermediate, current_out - RSTRING_PTR(*intermediate) );

RB_GC_GUARD(rb_typemap);
return -1;
}

Expand Down Expand Up @@ -366,12 +368,13 @@ pg_bin_enc_copy_row(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediat
{
t_pg_copycoder *this = (t_pg_copycoder *)conv;
int i;
VALUE rb_typemap = this->typemap;
t_typemap *p_typemap;
char *current_out;
char *end_capa_ptr;

p_typemap = RTYPEDDATA_DATA( this->typemap );
p_typemap->funcs.fit_to_query( this->typemap, value );
p_typemap = RTYPEDDATA_DATA( rb_typemap );
p_typemap->funcs.fit_to_query( rb_typemap, value );

/* Allocate a new string with embedded capacity and realloc exponential when needed. */
PG_RB_STR_NEW( *intermediate, current_out, end_capa_ptr );
Expand Down Expand Up @@ -432,6 +435,7 @@ pg_bin_enc_copy_row(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediat

rb_str_set_len( *intermediate, current_out - RSTRING_PTR(*intermediate) );

RB_GC_GUARD(rb_typemap);
return -1;
}

Expand Down Expand Up @@ -530,10 +534,11 @@ pg_text_dec_copy_row(t_pg_coder *conv, const char *input_line, int len, int _tup
const char *cur_ptr;
const char *line_end_ptr;
char *end_capa_ptr;
VALUE rb_typemap = this->typemap;
t_typemap *p_typemap;

p_typemap = RTYPEDDATA_DATA( this->typemap );
expected_fields = p_typemap->funcs.fit_to_copy_get( this->typemap );
p_typemap = RTYPEDDATA_DATA( rb_typemap );
expected_fields = p_typemap->funcs.fit_to_copy_get( rb_typemap );

/* The received input string will probably have this->nfields fields. */
array = rb_ary_new2(expected_fields);
Expand Down Expand Up @@ -714,6 +719,8 @@ pg_text_dec_copy_row(t_pg_coder *conv, const char *input_line, int len, int _tup
break;
}

RB_GC_GUARD(rb_typemap);

return array;
}

Expand Down Expand Up @@ -786,10 +793,11 @@ pg_bin_dec_copy_row(t_pg_coder *conv, const char *input_line, int len, int _tupl
const char *cur_ptr;
const char *line_end_ptr;
char *end_capa_ptr;
VALUE rb_typemap = this->typemap;
t_typemap *p_typemap;

p_typemap = RTYPEDDATA_DATA( this->typemap );
expected_fields = p_typemap->funcs.fit_to_copy_get( this->typemap );
p_typemap = RTYPEDDATA_DATA( rb_typemap );
expected_fields = p_typemap->funcs.fit_to_copy_get( rb_typemap );

/* Allocate a new string with embedded capacity and realloc later with
* exponential growing size when needed. */
Expand Down Expand Up @@ -871,6 +879,7 @@ pg_bin_dec_copy_row(t_pg_coder *conv, const char *input_line, int len, int _tupl
if (cur_ptr < line_end_ptr)
rb_raise( rb_eArgError, "trailing data after row data at position: %ld", (long)(cur_ptr - input_line) + 1 );

RB_GC_GUARD(rb_typemap);
return array;

length_error:
Expand Down
12 changes: 8 additions & 4 deletions ext/pg_record_coder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,12 +181,13 @@ pg_text_enc_record(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediate
t_pg_coder_enc_func enc_func;
static t_pg_coder *p_elem_coder;
int i;
VALUE rb_typemap = this->typemap;
t_typemap *p_typemap;
char *current_out;
char *end_capa_ptr;

p_typemap = RTYPEDDATA_DATA( this->typemap );
p_typemap->funcs.fit_to_query( this->typemap, value );
p_typemap = RTYPEDDATA_DATA( rb_typemap );
p_typemap->funcs.fit_to_query( rb_typemap, value );

/* Allocate a new string with embedded capacity and realloc exponential when needed. */
PG_RB_STR_NEW( *intermediate, current_out, end_capa_ptr );
Expand Down Expand Up @@ -277,6 +278,7 @@ pg_text_enc_record(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediate

rb_str_set_len( *intermediate, current_out - RSTRING_PTR(*intermediate) );

RB_GC_GUARD(rb_typemap);
return -1;
}

Expand Down Expand Up @@ -387,10 +389,11 @@ pg_text_dec_record(t_pg_coder *conv, char *input_line, int len, int _tuple, int
char *output_ptr;
char *cur_ptr;
char *end_capa_ptr;
VALUE rb_typemap = this->typemap;
t_typemap *p_typemap;

p_typemap = RTYPEDDATA_DATA( this->typemap );
expected_fields = p_typemap->funcs.fit_to_copy_get( this->typemap );
p_typemap = RTYPEDDATA_DATA( rb_typemap );
expected_fields = p_typemap->funcs.fit_to_copy_get( rb_typemap );

/* The received input string will probably have this->nfields fields. */
array = rb_ary_new2(expected_fields);
Expand Down Expand Up @@ -490,6 +493,7 @@ pg_text_dec_record(t_pg_coder *conv, char *input_line, int len, int _tuple, int
if (*cur_ptr)
rb_raise( rb_eArgError, "malformed record literal: \"%s\" - Junk after right parenthesis.", input_line );

RB_GC_GUARD(rb_typemap);
return array;
}

Expand Down
Loading