pg 1.6.2 → 1.7.0

data/ext/pg_copy_coder.c

@@ -55,7 +55,7 @@ static const rb_data_type_t pg_copycoder_type = {
 	},
 	&pg_coder_type,
 	0,
-	RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | PG_RUBY_TYPED_FROZEN_SHAREABLE,
+	RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FROZEN_SHAREABLE,
 };
 
 static VALUE
@@ -219,20 +219,21 @@ pg_text_enc_copy_row(t_pg_coder *conv, VALUE value, char *out, VALUE *intermedia
 {
 	t_pg_copycoder *this = (t_pg_copycoder *)conv;
 	t_pg_coder_enc_func enc_func;
-	static t_pg_coder *p_elem_coder;
+	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 );
 	PG_ENCODING_SET_NOCHECK(*intermediate, enc_idx);
 
-	for( i=0; i<RARRAY_LEN(value); i++){
+	for( i=0; i<RARRAY_LENINT(value); i++){
 		char *ptr1;
 		char *ptr2;
 		int strlen;
@@ -265,7 +266,7 @@ pg_text_enc_copy_row(t_pg_coder *conv, VALUE value, char *out, VALUE *intermedia
 					strlen = RSTRING_LENINT(subint);
 
 					/* size of string assuming the worst case, that every character must be escaped. */
-					PG_RB_STR_ENSURE_CAPA( *intermediate, strlen * 2, current_out, end_capa_ptr );
+					PG_RB_STR_ENSURE_CAPA( *intermediate, (size_t)strlen * 2, current_out, end_capa_ptr );
 
 					/* Copy string from subint with backslash escaping */
 					for(ptr1 = RSTRING_PTR(subint); ptr1 < RSTRING_PTR(subint) + strlen; ptr1++) {
@@ -278,7 +279,7 @@ pg_text_enc_copy_row(t_pg_coder *conv, VALUE value, char *out, VALUE *intermedia
 				} else {
 					/* 2nd pass for writing the data to prepared buffer */
 					/* size of string assuming the worst case, that every character must be escaped. */
-					PG_RB_STR_ENSURE_CAPA( *intermediate, strlen * 2, current_out, end_capa_ptr );
+					PG_RB_STR_ENSURE_CAPA( *intermediate, (size_t)strlen * 2, current_out, end_capa_ptr );
 
 					/* Place the unescaped string at current output position. */
 					strlen = enc_func(p_elem_coder, entry, current_out, &subint, enc_idx);
@@ -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;
 }
 
@@ -366,12 +368,17 @@ 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 );
+	if( RARRAY_LEN(value) >= 32768 ){
+		rb_raise( rb_eArgError, "too many columns in array for PG::BinaryEncoder::CopyRow: %ld", RARRAY_LEN(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 );
@@ -382,12 +389,12 @@ pg_bin_enc_copy_row(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediat
 	write_nbo16(RARRAY_LEN(value), current_out);
 	current_out += 2;
 
-	for( i=0; i<RARRAY_LEN(value); i++){
+	for( i=0; i<RARRAY_LENINT(value); i++){
 		int strlen;
 		VALUE subint;
 		VALUE entry;
 		t_pg_coder_enc_func enc_func;
-		static t_pg_coder *p_elem_coder;
+		t_pg_coder *p_elem_coder;
 
 		entry = rb_ary_entry(value, i);
 
@@ -409,7 +416,7 @@ pg_bin_enc_copy_row(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediat
 					/* we can directly use String value in subint */
 					strlen = RSTRING_LENINT(subint);
 
-					PG_RB_STR_ENSURE_CAPA( *intermediate, 4 + strlen, current_out, end_capa_ptr );
+					PG_RB_STR_ENSURE_CAPA( *intermediate, (size_t)4 + strlen, current_out, end_capa_ptr );
 					/* 4 bytes length */
 					write_nbo32(strlen, current_out);
 					current_out += 4;
@@ -418,7 +425,7 @@ pg_bin_enc_copy_row(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediat
 					current_out += strlen;
 				} else {
 					/* 2nd pass for writing the data to prepared buffer */
-					PG_RB_STR_ENSURE_CAPA( *intermediate, 4 + strlen, current_out, end_capa_ptr );
+					PG_RB_STR_ENSURE_CAPA( *intermediate, (size_t)4 + strlen, current_out, end_capa_ptr );
 					/* 4 bytes length */
 					write_nbo32(strlen, current_out);
 					current_out += 4;
@@ -432,6 +439,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;
 }
 
@@ -530,10 +538,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);
@@ -553,7 +562,7 @@ pg_text_dec_copy_row(t_pg_coder *conv, const char *input_line, int len, int _tup
 		int found_delim = 0;
 		const char *start_ptr;
 		const char *end_ptr;
-		long input_len;
+		size_t input_len;
 
 		/* Remember start of field on input side */
 		start_ptr = cur_ptr;
@@ -688,7 +697,7 @@ pg_text_dec_copy_row(t_pg_coder *conv, const char *input_line, int len, int _tup
 
 		/* Check whether raw input matched null marker */
 		input_len = end_ptr - start_ptr;
-		if (input_len == RSTRING_LEN(this->null_string) &&
+		if (input_len == (size_t)RSTRING_LEN(this->null_string) &&
 					strncmp(start_ptr, RSTRING_PTR(this->null_string), input_len) == 0) {
 			rb_ary_push(array, Qnil);
 		} else {
@@ -714,11 +723,13 @@ 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;
 }
 
 
-static const char BinarySignature[11] = "PGCOPY\n\377\r\n\0";
+static const char BinarySignature[11] = {'P','G','C','O','P','Y','\n','\377','\r','\n','\0'};
 
 /*
  * Document-class: PG::BinaryDecoder::CopyRow < PG::CopyDecoder
@@ -786,10 +797,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. */
@@ -830,7 +842,7 @@ pg_bin_dec_copy_row(t_pg_coder *conv, const char *input_line, int len, int _tupl
 		array = rb_ary_new2(expected_fields);
 
 		for( fieldno = 0; fieldno < nfields; fieldno++){
-			long input_len;
+			int input_len;
 
 			/* read field size */
 			if (line_end_ptr - cur_ptr < 4 ) goto length_error;
@@ -871,6 +883,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:

data/ext/pg_record_coder.c

@@ -47,7 +47,7 @@ static const rb_data_type_t pg_recordcoder_type = {
 	},
 	&pg_coder_type,
 	0,
-	RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | PG_RUBY_TYPED_FROZEN_SHAREABLE,
+	RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FROZEN_SHAREABLE,
 };
 
 static VALUE
@@ -179,14 +179,15 @@ pg_text_enc_record(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediate
 {
 	t_pg_recordcoder *this = (t_pg_recordcoder *)conv;
 	t_pg_coder_enc_func enc_func;
-	static t_pg_coder *p_elem_coder;
+	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 );
@@ -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;
 }
 
@@ -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);
@@ -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;
 }