diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2010-05-08 16:40:31 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2010-05-08 16:40:31 +0000 |
| commit | 27594103806c8e209993f31a50d91d7add968b2f (patch) | |
| tree | fc415f9f8e6d086e39b21c81d644f7a6566ab994 /src/backend | |
| parent | e7a03793d86e155664bad149f570da5d7743983a (diff) | |
| download | postgresql-27594103806c8e209993f31a50d91d7add968b2f.tar.gz postgresql-27594103806c8e209993f31a50d91d7add968b2f.zip | |
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".
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/parser/scansup.c | 16 | ||||
| -rw-r--r-- | src/backend/utils/error/elog.c | 4 |
2 files changed, 15 insertions, 5 deletions
diff --git a/src/backend/parser/scansup.c b/src/backend/parser/scansup.c index 807338652b4..aa10fddfb64 100644 --- a/src/backend/parser/scansup.c +++ b/src/backend/parser/scansup.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/scansup.c,v 1.34 2006/09/22 21:39:57 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/parser/scansup.c,v 1.34.2.1 2010/05/08 16:40:31 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'; } } diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c index d783f060b60..efa5d8c99bf 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -42,7 +42,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.178.2.8 2009/03/03 00:17:22 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.178.2.9 2010/05/08 16:40:31 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -1557,7 +1557,7 @@ log_line_prefix(StringInfo buf) int displen; psdisp = get_ps_display(&displen); - appendStringInfo(buf, "%.*s", displen, psdisp); + appendBinaryStringInfo(buf, psdisp, displen); } break; case 'r': |