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

Improve our response to invalid format strings, and detect more cases.

Browse Source 
Places that are testing for *printf failure ought to include the format
string in their error reports, since bad-format-string is one of the
more likely causes of such failure.  This both makes it easier to find
and repair the mistake, and provides at least some useful info to the
user who stumbles across such a problem.

Also, tighten snprintf.c to report EINVAL for an invalid flag or
final character in a format %-spec (including the case where the
%-spec is missing a final character altogether).  This seems like
better project policy, and it also allows removing an instruction
or two from the hot code path.

Back-patch the error reporting change in pvsnprintf, since it should be
harmless and may be helpful; but not the snprintf.c change.

Per discussion of bug #15511 from Ertuğrul Kahveci, which reported an
invalid translated format string.  These changes don't fix that error,
but they should improve matters next time we make such a mistake.

Discussion: https://postgr.es/m/15511-1d8b6a0bc874112f@postgresql.org
This commit is contained in:
Tom Lane 2018-12-06 15:08:44 -05:00
parent 7a55ccc477
commit d2b0b60e71
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/utils/misc/guc.c
View File

@ -4387,7 +4387,7 @@ static struct config_enum ConfigureNamesEnum[] =
},
&ssl_min_protocol_version,
PG_TLS1_VERSION,
ssl_protocol_versions_info + 1 /* don't allow PG_TLS_ANY */,
ssl_protocol_versions_info + 1, /* don't allow PG_TLS_ANY */
NULL, NULL, NULL
},
@ -9666,7 +9666,7 @@ do_serialize(char **destptr, Size *maxbytes, const char *fmt,...)
if (n < 0)
{
/* Shouldn't happen. Better show errno description. */
elog(ERROR, "vsnprintf failed: %m");
elog(ERROR, "vsnprintf failed: %m with format string \"%s\"", fmt);
}
if (n >= *maxbytes)
{

4
src/common/psprintf.c
View File

@ -113,9 +113,9 @@ pvsnprintf(char *buf, size_t len, const char *fmt, va_list args)
if (unlikely(nprinted < 0))
{
#ifndef FRONTEND
elog(ERROR, "vsnprintf failed: %m");
elog(ERROR, "vsnprintf failed: %m with format string \"%s\"", fmt);
#else
fprintf(stderr, "vsnprintf failed: %s\n", strerror(errno));
fprintf(stderr, "vsnprintf failed: %m with format string \"%s\"\n", fmt);
exit(EXIT_FAILURE);
#endif
}

13
src/port/snprintf.c
View File

@ -452,8 +452,6 @@ dopr(PrintfTarget *target, const char *format, va_list args)
have_star = afterstar = false;
nextch2:
ch = *format++;
if (ch == '\0')
break; /* illegal, but we don't complain */
switch (ch)
{
case '-':
@ -718,6 +716,13 @@ nextch2:
case '%':
dopr_outch('%', target);
break;
default:
/*
* Anything else --- in particular, '\0' indicating end of
* format string --- is bogus.
*/
goto bad_format;
}
/* Check for failure after each conversion spec */
@ -782,8 +787,6 @@ find_arguments(const char *format, va_list args,
afterstar = false;
nextch1:
ch = *format++;
if (ch == '\0')
break; /* illegal, but we don't complain */
switch (ch)
{
case '-':
@ -918,6 +921,8 @@ nextch1:
case 'm':
case '%':
break;
default:
return false; /* bogus format string */
}
/*