diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2012-05-25 17:35:14 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2012-05-25 17:35:14 -0400 |
| commit | 2a7c90c83bc5b668764faae643b9f3d8c652667a (patch) | |
| tree | 82c160e2624d0a2f6da06dd71e32e36aa9a56fd6 /src/backend/utils/adt/name.c | |
| parent | 5e0f3c793a3767f38498d9cd54a3bfeeccdce6bf (diff) | |
| download | postgresql-2a7c90c83bc5b668764faae643b9f3d8c652667a.tar.gz postgresql-2a7c90c83bc5b668764faae643b9f3d8c652667a.zip | |
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
Diffstat (limited to 'src/backend/utils/adt/name.c')
| -rw-r--r-- | src/backend/utils/adt/name.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/backend/utils/adt/name.c b/src/backend/utils/adt/name.c index 23b3722375e..9729c0d3acc 100644 --- a/src/backend/utils/adt/name.c +++ b/src/backend/utils/adt/name.c @@ -46,13 +46,17 @@ Datum namein(PG_FUNCTION_ARGS) { char *s = PG_GETARG_CSTRING(0); - NameData *result; + Name result; int len; len = strlen(s); - len = pg_mbcliplen(s, len, NAMEDATALEN - 1); - result = (NameData *) palloc0(NAMEDATALEN); + /* Truncate oversize input */ + if (len >= NAMEDATALEN) + len = pg_mbcliplen(s, len, NAMEDATALEN - 1); + + /* We use palloc0 here to ensure result is zero-padded */ + result = (Name) palloc0(NAMEDATALEN); memcpy(NameStr(*result), s, len); PG_RETURN_NAME(result); |