database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-21 16:02:15 +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:35:05 -04:00
parent 965d76f972
commit d566ad3eb3
3 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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);
}