mirror of
https://github.com/postgres/postgres.git
synced 2025-07-09 22:41:56 +03:00
Work around a subtle portability problem in use of printf %s format.
Depending on which spec you read, field widths and precisions in %s may be counted either in bytes or characters. Our code was assuming bytes, which is wrong at least for glibc's implementation, and in any case libc might have a different idea of the prevailing encoding than we do. Hence, for portable results we must avoid using anything more complex than just "%s" unless the string to be printed is known to be all-ASCII. This patch fixes the cases I could find, including the psql formatting failure reported by Hernan Gonzalez. In HEAD only, I also added comments to some places where it appears safe to continue using "%.*s".
This commit is contained in:
@ -9,7 +9,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $PostgreSQL: pgsql/src/backend/parser/scansup.c,v 1.39 2010/01/02 16:57:50 momjian Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/parser/scansup.c,v 1.40 2010/05/08 16:39:49 tgl Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -176,10 +176,20 @@ truncate_identifier(char *ident, int len, bool warn)
|
||||
{
|
||||
len = pg_mbcliplen(ident, len, NAMEDATALEN - 1);
|
||||
if (warn)
|
||||
{
|
||||
/*
|
||||
* Cannot use %.*s here because some machines interpret %s's
|
||||
* precision in characters, others in bytes.
|
||||
*/
|
||||
char buf[NAMEDATALEN];
|
||||
|
||||
memcpy(buf, ident, len);
|
||||
buf[len] = '\0';
|
||||
ereport(NOTICE,
|
||||
(errcode(ERRCODE_NAME_TOO_LONG),
|
||||
errmsg("identifier \"%s\" will be truncated to \"%.*s\"",
|
||||
ident, len, ident)));
|
||||
errmsg("identifier \"%s\" will be truncated to \"%s\"",
|
||||
ident, buf)));
|
||||
}
|
||||
ident[len] = '\0';
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user