From 61a4a3a62a98bb7508a86d00900e80e23ebf2b63 Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Mon, 27 Jul 2020 10:29:11 +0900 Subject: [PATCH] Fix handling of structure for bytea data type in ECPG 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 --- src/interfaces/ecpg/ecpglib/data.c | 4 ++-- src/interfaces/ecpg/ecpglib/descriptor.c | 4 ++-- src/interfaces/ecpg/ecpglib/execute.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/interfaces/ecpg/ecpglib/data.c b/src/interfaces/ecpg/ecpglib/data.c index 81f94cc12b..9cf0292e02 100644 --- 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 index ef500a915d..31ebd4c41e 100644 --- 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 index 606aff6373..6b40ecd910 100644 --- 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; } }