database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-14 18:42:34 +03:00
Code Activity

Fix string truncation to be multibyte-aware in text_name and bpchar_name.

Browse Source 
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
This commit is contained in:
Tom Lane
2012-05-25 17:34:58 -04:00
parent 1a93588ffc
commit 71e985a07a
3 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/backend/utils/adt/name.c
View File

@ -46,13 +46,17 @@ Datum
namein(PG_FUNCTION_ARGS) namein(PG_FUNCTION_ARGS)
{ {
char *s = PG_GETARG_CSTRING(0); char *s = PG_GETARG_CSTRING(0);
NameData *result; Name result;
int len; int len;
len = strlen(s); 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); memcpy(NameStr(*result), s, len);
PG_RETURN_NAME(result); PG_RETURN_NAME(result);

14
src/backend/utils/adt/varchar.c
View File

@ -371,9 +371,9 @@ bpchar_name(PG_FUNCTION_ARGS)
len = VARSIZE_ANY_EXHDR(s); len = VARSIZE_ANY_EXHDR(s);
s_data = VARDATA_ANY(s); s_data = VARDATA_ANY(s);
/* Truncate to max length for a Name */ /* Truncate oversize input */
if (len >= NAMEDATALEN) if (len >= NAMEDATALEN)
len = NAMEDATALEN - 1; len = pg_mbcliplen(s_data, len, NAMEDATALEN - 1);
/* Remove trailing blanks */ /* Remove trailing blanks */
while (len > 0) while (len > 0)
@ -383,16 +383,10 @@ bpchar_name(PG_FUNCTION_ARGS)
len--; 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); memcpy(NameStr(*result), s_data, len);
/* Now null pad to full length... */
while (len < NAMEDATALEN)
{
*(NameStr(*result) + len) = '\0';
len++;
}
PG_RETURN_NAME(result); PG_RETURN_NAME(result);
} }

12
src/backend/utils/adt/varlena.c
View File

@ -2198,18 +2198,12 @@ text_name(PG_FUNCTION_ARGS)
/* Truncate oversize input */ /* Truncate oversize input */
if (len >= NAMEDATALEN) if (len >= NAMEDATALEN)
len = NAMEDATALEN - 1; len = pg_mbcliplen(VARDATA_ANY(s), len, NAMEDATALEN - 1);
result = (Name) palloc(NAMEDATALEN); /* We use palloc0 here to ensure result is zero-padded */
result = (Name) palloc0(NAMEDATALEN);
memcpy(NameStr(*result), VARDATA_ANY(s), len); memcpy(NameStr(*result), VARDATA_ANY(s), len);
/* now null pad to full length... */
while (len < NAMEDATALEN)
{
*(NameStr(*result) + len) = '\0';
len++;
}
PG_RETURN_NAME(result); PG_RETURN_NAME(result);
} }