mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-09 08:10:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Work around a subtle portability problem in use of printf %s format.

Browse Source 
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:
Tom Lane 2010-05-08 16:40:14 +00:00
parent 944cae5f76
commit db01ccc052
3 changed files with 41 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/backend/parser/scansup.c
View File

@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/parser/scansup.c,v 1.36 2008/01/01 19:45:51 momjian Exp $
* $PostgreSQL: pgsql/src/backend/parser/scansup.c,v 1.36.2.1 2010/05/08 16:40:14 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';
}
}

6
src/backend/utils/error/elog.c
View File

@ -42,7 +42,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.201.2.4 2009/03/03 00:17:13 tgl Exp $
* $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.201.2.5 2010/05/08 16:40:14 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -1615,7 +1615,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':
@ -1794,7 +1794,7 @@ write_csvlog(ErrorData *edata)
initStringInfo(&msgbuf);
psdisp = get_ps_display(&displen);
appendStringInfo(&msgbuf, "%.*s", displen, psdisp);
appendBinaryStringInfo(&msgbuf, psdisp, displen);
appendCSVLiteral(&buf, msgbuf.data);
pfree(msgbuf.data);

29
src/interfaces/libpq/fe-misc.c
View File

@ -23,7 +23,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-misc.c,v 1.133.2.1 2008/08/20 11:53:51 mha Exp $
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-misc.c,v 1.133.2.2 2010/05/08 16:40:14 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -67,6 +67,20 @@ static int pqSocketCheck(PGconn *conn, int forRead, int forWrite,
static int pqSocketPoll(int sock, int forRead, int forWrite, time_t end_time);
/*
* fputnbytes: print exactly N bytes to a file
*
* Think not to use fprintf with a %.*s format for this. Some machines
* believe %s's precision is measured in characters, others in bytes.
*/
static void
fputnbytes(FILE *f, const char *str, size_t n)
{
while (n-- > 0)
fputc(*str++, f);
}
/*
* pqGetc: get 1 character from the connection
*
@ -173,8 +187,11 @@ pqGetnchar(char *s, size_t len, PGconn *conn)
conn->inCursor += len;
if (conn->Pfdebug)
fprintf(conn->Pfdebug, "From backend (%lu)> %.*s\n",
(unsigned long) len, (int) len, s);
{
fprintf(conn->Pfdebug, "From backend (%lu)> ", (unsigned long) len);
fputnbytes(conn->Pfdebug, s, len);
fprintf(conn->Pfdebug, "\n");
}
return 0;
}
@ -190,7 +207,11 @@ pqPutnchar(const char *s, size_t len, PGconn *conn)
return EOF;
if (conn->Pfdebug)
fprintf(conn->Pfdebug, "To backend> %.*s\n", (int) len, s);
{
fprintf(conn->Pfdebug, "To backend> ");
fputnbytes(conn->Pfdebug, s, len);
fprintf(conn->Pfdebug, "\n");
}
return 0;
}