diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2014-05-26 22:23:39 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2014-05-26 22:23:39 -0400 |
| commit | 3ae8e8bf552f622600b1a356550882e886753119 (patch) | |
| tree | b7cba48866b051d87ceccccac29fc4a84bc14986 | |
| parent | 0d202521988e541827adea389b2a3b4e6c351bfe (diff) | |
| download | postgresql-3ae8e8bf552f622600b1a356550882e886753119.tar.gz postgresql-3ae8e8bf552f622600b1a356550882e886753119.zip | |
Avoid unportable usage of sscanf(UINT64_FORMAT).
On Mingw, it seems that scanf() doesn't necessarily accept the same format
codes that printf() does, and in particular it may fail to recognize %llu
even though printf() does. Since configure only probes printf() behavior
while setting up the INT64_FORMAT macros, this means it's unsafe to use
those macros with scanf(). We had only one instance of such a coding
pattern, in contrib/pg_stat_statements, so change that code to avoid
the problem.
Per buildfarm warnings. Back-patch to 9.0 where the troublesome code
was introduced.
Michael Paquier
| -rw-r--r-- | contrib/pg_stat_statements/pg_stat_statements.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/contrib/pg_stat_statements/pg_stat_statements.c b/contrib/pg_stat_statements/pg_stat_statements.c index 468282ec997..5793068446d 100644 --- a/contrib/pg_stat_statements/pg_stat_statements.c +++ b/contrib/pg_stat_statements/pg_stat_statements.c @@ -635,7 +635,7 @@ pgss_ProcessUtility(Node *parsetree, const char *queryString, { instr_time start; instr_time duration; - uint64 rows = 0; + uint64 rows; BufferUsage bufusage; bufusage = pgBufferUsage; @@ -664,7 +664,15 @@ pgss_ProcessUtility(Node *parsetree, const char *queryString, /* parse command tag to retrieve the number of affected rows. */ if (completionTag && - sscanf(completionTag, "COPY " UINT64_FORMAT, &rows) != 1) + strncmp(completionTag, "COPY ", 5) == 0) + { +#ifdef HAVE_STRTOULL + rows = strtoull(completionTag + 5, NULL, 10); +#else + rows = strtoul(completionTag + 5, NULL, 10); +#endif + } + else rows = 0; /* calc differences of buffer counters. */ |