From 71e985a07a7ae9319c00629f319a4c30a9e32fd6 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Fri, 25 May 2012 17:34:58 -0400 Subject: Fix string truncation to be multibyte-aware in text_name and bpchar_name. Previously, casts to name could generate invalidly-encoded results. Also, make these functions match namein() more exactly, by consistently using palloc0() instead of ad-hoc zeroing code. Back-patch to all supported branches. Karl Schnaitter and Tom Lane --- src/backend/utils/adt/varchar.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'src/backend/utils/adt/varchar.c') diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c index 1c0ef921a71..7b84637f8cf 100644 --- a/src/backend/utils/adt/varchar.c +++ b/src/backend/utils/adt/varchar.c @@ -371,9 +371,9 @@ bpchar_name(PG_FUNCTION_ARGS) len = VARSIZE_ANY_EXHDR(s); s_data = VARDATA_ANY(s); - /* Truncate to max length for a Name */ + /* Truncate oversize input */ if (len >= NAMEDATALEN) - len = NAMEDATALEN - 1; + len = pg_mbcliplen(s_data, len, NAMEDATALEN - 1); /* Remove trailing blanks */ while (len > 0) @@ -383,16 +383,10 @@ bpchar_name(PG_FUNCTION_ARGS) len--; } - result = (NameData *) palloc(NAMEDATALEN); + /* We use palloc0 here to ensure result is zero-padded */ + result = (Name) palloc0(NAMEDATALEN); memcpy(NameStr(*result), s_data, len); - /* Now null pad to full length... */ - while (len < NAMEDATALEN) - { - *(NameStr(*result) + len) = '\0'; - len++; - } - PG_RETURN_NAME(result); } -- cgit v1.2.3