diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2010-05-08 16:39:53 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2010-05-08 16:39:53 +0000 |
| commit | 54cd4f04576833abc394e131288bf3dd7dcf4806 (patch) | |
| tree | 0772e1bedbca8466701b6a116e065e7a00959ebd /src/interfaces/ecpg/ecpglib/error.c | |
| parent | 71a185a24d573dc1449777ff9fa8f3020af6f13c (diff) | |
| download | postgresql-54cd4f04576833abc394e131288bf3dd7dcf4806.tar.gz postgresql-54cd4f04576833abc394e131288bf3dd7dcf4806.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/interfaces/ecpg/ecpglib/error.c')
| -rw-r--r-- | src/interfaces/ecpg/ecpglib/error.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/interfaces/ecpg/ecpglib/error.c b/src/interfaces/ecpg/ecpglib/error.c index ea48f082dca..5451fd29819 100644 --- a/src/interfaces/ecpg/ecpglib/error.c +++ b/src/interfaces/ecpg/ecpglib/error.c @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/error.c,v 1.25 2010/03/08 12:15:24 meskes Exp $ */ +/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/error.c,v 1.26 2010/05/08 16:39:52 tgl Exp $ */ #define POSTGRES_ECPG_INTERNAL #include "postgres_fe.h" @@ -332,6 +332,7 @@ ecpg_raise_backend(int line, PGresult *result, PGconn *conn, int compat) else sqlca->sqlcode = ECPG_PGSQL; + /* %.*s is safe here as long as sqlstate is all-ASCII */ ecpg_log("raising sqlstate %.*s (sqlcode %d): %s\n", sizeof(sqlca->sqlstate), sqlca->sqlstate, sqlca->sqlcode, sqlca->sqlerrm.sqlerrmc); |