Fix handling of structure for bytea data type in ECPG

michaelpq · michaelpq · commit 61a4a3a62a98 · 2020-07-27T10:29:11.000+09:00
Some code paths dedicated to bytea used the structure for varchar. This did not lead to any actual bugs, as bytea and varchar have the same definition, but it could become a trap if one of these definitions changes for a new feature or a bug fix. Issue introduced by 050710b. Author: Shenhao Wang Reviewed-by: Vignesh C, Michael Paquier Discussion: https://postgr.es/m/07ac7dee1efc44f99d7f53a074420177@G08CNEXMBPEKD06.g08.fujitsu.local Backpatch-through: 12
diff --git a/src/interfaces/ecpg/ecpglib/data.c b/src/interfaces/ecpg/ecpglib/data.c
@@ -529,8 +529,8 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 
 				case ECPGt_bytea:
 					{
-						struct ECPGgeneric_varchar *variable =
-						(struct ECPGgeneric_varchar *) (var + offset * act_tuple);
+						struct ECPGgeneric_bytea *variable =
+						(struct ECPGgeneric_bytea *) (var + offset * act_tuple);
 						long		dst_size,
 									src_size,
 									dec_size;
diff --git a/src/interfaces/ecpg/ecpglib/descriptor.c b/src/interfaces/ecpg/ecpglib/descriptor.c
@@ -596,8 +596,8 @@ set_desc_attr(struct descriptor_item *desc_item, struct variable *var,
 
 	else
 	{
-		struct ECPGgeneric_varchar *variable =
-		(struct ECPGgeneric_varchar *) (var->value);
+		struct ECPGgeneric_bytea *variable =
+		(struct ECPGgeneric_bytea *) (var->value);
 
 		desc_item->is_binary = true;
 		desc_item->data_len = variable->len;
diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c
@@ -825,8 +825,8 @@ ecpg_store_input(const int lineno, const bool force_indicator, const struct vari
 
 			case ECPGt_bytea:
 				{
-					struct ECPGgeneric_varchar *variable =
-					(struct ECPGgeneric_varchar *) (var->value);
+					struct ECPGgeneric_bytea *variable =
+					(struct ECPGgeneric_bytea *) (var->value);
 
 					if (!(mallocedval = (char *) ecpg_alloc(variable->len, lineno)))
 						return false;
@@ -1404,7 +1404,7 @@ ecpg_build_params(struct statement *stmt)
 
 			if (var->type == ECPGt_bytea)
 			{
-				binary_length = ((struct ECPGgeneric_varchar *) (var->value))->len;
+				binary_length = ((struct ECPGgeneric_bytea *) (var->value))->len;
 				binary_format = true;
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -596,8 +596,8 @@ set_desc_attr(struct descriptor_item desc_item, struct variable var,`
`596`	`596`
`597`	`597`	`else`
`598`	`598`	`{`
`599`		`- struct ECPGgeneric_varchar *variable =`
`600`		`- (struct ECPGgeneric_varchar *) (var->value);`
	`599`	`+ struct ECPGgeneric_bytea *variable =`
	`600`	`+ (struct ECPGgeneric_bytea *) (var->value);`
`601`	`601`
`602`	`602`	`desc_item->is_binary = true;`
`603`	`603`	`desc_item->data_len = variable->len;`
Original file line number	Diff line number	Diff line change
`@@ -825,8 +825,8 @@ ecpg_store_input(const int lineno, const bool force_indicator, const struct vari`
`825`	`825`
`826`	`826`	`case ECPGt_bytea:`
`827`	`827`	`{`
`828`		`- struct ECPGgeneric_varchar *variable =`
`829`		`- (struct ECPGgeneric_varchar *) (var->value);`
	`828`	`+ struct ECPGgeneric_bytea *variable =`
	`829`	`+ (struct ECPGgeneric_bytea *) (var->value);`
`830`	`830`
`831`	`831`	`if (!(mallocedval = (char *) ecpg_alloc(variable->len, lineno)))`
`832`	`832`	`return false;`
`@@ -1404,7 +1404,7 @@ ecpg_build_params(struct statement *stmt)`
`1404`	`1404`
`1405`	`1405`	`if (var->type == ECPGt_bytea)`
`1406`	`1406`	`{`
`1407`		`- binary_length = ((struct ECPGgeneric_varchar *) (var->value))->len;`
	`1407`	`+ binary_length = ((struct ECPGgeneric_bytea *) (var->value))->len;`
`1408`	`1408`	`binary_format = true;`
`1409`	`1409`	`}`
`1410`	`1410`	`}`