Clean up assorted misuses of snprintf()'s result value.
Fix a small number of places that were testing the result of snprintf() but doing so incorrectly. The right test for buffer overrun, per C99, is "result >= bufsize" not "result > bufsize". Some places were also checking for failure with "result == -1", but the standard only says that a negative value is delivered on failure. (Note that this only makes these places correct if snprintf() delivers C99-compliant results. But at least now these places are consistent with all the other places where we assume that.) Also, make psql_start_test() and isolation_start_test() check for buffer overrun while constructing their shell commands. There seems like a higher risk of overrun, with more severe consequences, here than there is for the individual file paths that are made elsewhere in the same functions, so this seemed like a worthwhile change. Also fix guc.c's do_serialize() to initialize errno = 0 before calling vsnprintf. In principle, this should be unnecessary because vsnprintf should have set errno if it returns a failure indication ... but the other two places this coding pattern is cribbed from don't assume that, so let's be consistent. These errors are all very old, so back-patch as appropriate. I think that only the shell command overrun cases are even theoretically reachable in practice, but there's not much point in erroneous error checks. Discussion: https://postgr.es/m/17245.1534289329@sss.pgh.pa.us
This commit is contained in:
parent
805889d7d2
commit
cc4f6b7786
@ -4810,7 +4810,7 @@ get_dbstat_filename(bool permanent, bool tempname, Oid databaseid,
|
|||||||
pgstat_stat_directory,
|
pgstat_stat_directory,
|
||||||
databaseid,
|
databaseid,
|
||||||
tempname ? "tmp" : "stat");
|
tempname ? "tmp" : "stat");
|
||||||
if (printed > len)
|
if (printed >= len)
|
||||||
elog(ERROR, "overlength pgstat path");
|
elog(ERROR, "overlength pgstat path");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -9441,6 +9441,8 @@ do_serialize(char **destptr, Size *maxbytes, const char *fmt,...)
|
|||||||
if (*maxbytes <= 0)
|
if (*maxbytes <= 0)
|
||||||
elog(ERROR, "not enough space to serialize GUC state");
|
elog(ERROR, "not enough space to serialize GUC state");
|
||||||
|
|
||||||
|
errno = 0;
|
||||||
|
|
||||||
va_start(vargs, fmt);
|
va_start(vargs, fmt);
|
||||||
n = vsnprintf(*destptr, *maxbytes, fmt, vargs);
|
n = vsnprintf(*destptr, *maxbytes, fmt, vargs);
|
||||||
va_end(vargs);
|
va_end(vargs);
|
||||||
|
@ -233,7 +233,7 @@ getnameinfo_unix(const struct sockaddr_un *sa, int salen,
|
|||||||
char *service, int servicelen,
|
char *service, int servicelen,
|
||||||
int flags)
|
int flags)
|
||||||
{
|
{
|
||||||
int ret = -1;
|
int ret;
|
||||||
|
|
||||||
/* Invalid arguments. */
|
/* Invalid arguments. */
|
||||||
if (sa == NULL || sa->sun_family != AF_UNIX ||
|
if (sa == NULL || sa->sun_family != AF_UNIX ||
|
||||||
@ -243,14 +243,14 @@ getnameinfo_unix(const struct sockaddr_un *sa, int salen,
|
|||||||
if (node)
|
if (node)
|
||||||
{
|
{
|
||||||
ret = snprintf(node, nodelen, "%s", "[local]");
|
ret = snprintf(node, nodelen, "%s", "[local]");
|
||||||
if (ret == -1 || ret > nodelen)
|
if (ret < 0 || ret >= nodelen)
|
||||||
return EAI_MEMORY;
|
return EAI_MEMORY;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (service)
|
if (service)
|
||||||
{
|
{
|
||||||
ret = snprintf(service, servicelen, "%s", sa->sun_path);
|
ret = snprintf(service, servicelen, "%s", sa->sun_path);
|
||||||
if (ret == -1 || ret > servicelen)
|
if (ret < 0 || ret >= servicelen)
|
||||||
return EAI_MEMORY;
|
return EAI_MEMORY;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -110,7 +110,7 @@ pgtypes_fmt_replace(union un_fmt_comb replace_val, int replace_type, char **outp
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (i < 0)
|
if (i < 0 || i >= PGTYPES_FMT_NUM_MAX_DIGITS)
|
||||||
{
|
{
|
||||||
free(t);
|
free(t);
|
||||||
return -1;
|
return -1;
|
||||||
|
@ -405,7 +405,7 @@ getnameinfo(const struct sockaddr *sa, int salen,
|
|||||||
ret = snprintf(service, servicelen, "%d",
|
ret = snprintf(service, servicelen, "%d",
|
||||||
pg_ntoh16(((struct sockaddr_in *) sa)->sin_port));
|
pg_ntoh16(((struct sockaddr_in *) sa)->sin_port));
|
||||||
}
|
}
|
||||||
if (ret == -1 || ret >= servicelen)
|
if (ret < 0 || ret >= servicelen)
|
||||||
return EAI_MEMORY;
|
return EAI_MEMORY;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -75,15 +75,27 @@ isolation_start_test(const char *testname,
|
|||||||
add_stringlist_item(expectfiles, expectfile);
|
add_stringlist_item(expectfiles, expectfile);
|
||||||
|
|
||||||
if (launcher)
|
if (launcher)
|
||||||
|
{
|
||||||
offset += snprintf(psql_cmd + offset, sizeof(psql_cmd) - offset,
|
offset += snprintf(psql_cmd + offset, sizeof(psql_cmd) - offset,
|
||||||
"%s ", launcher);
|
"%s ", launcher);
|
||||||
|
if (offset >= sizeof(psql_cmd))
|
||||||
|
{
|
||||||
|
fprintf(stderr, _("command too long\n"));
|
||||||
|
exit(2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
snprintf(psql_cmd + offset, sizeof(psql_cmd) - offset,
|
offset += snprintf(psql_cmd + offset, sizeof(psql_cmd) - offset,
|
||||||
"\"%s\" \"dbname=%s\" < \"%s\" > \"%s\" 2>&1",
|
"\"%s\" \"dbname=%s\" < \"%s\" > \"%s\" 2>&1",
|
||||||
isolation_exec,
|
isolation_exec,
|
||||||
dblist->str,
|
dblist->str,
|
||||||
infile,
|
infile,
|
||||||
outfile);
|
outfile);
|
||||||
|
if (offset >= sizeof(psql_cmd))
|
||||||
|
{
|
||||||
|
fprintf(stderr, _("command too long\n"));
|
||||||
|
exit(2);
|
||||||
|
}
|
||||||
|
|
||||||
pid = spawn_process(psql_cmd);
|
pid = spawn_process(psql_cmd);
|
||||||
|
|
||||||
|
@ -1024,7 +1024,7 @@ config_sspi_auth(const char *pgdata)
|
|||||||
} while (0)
|
} while (0)
|
||||||
|
|
||||||
res = snprintf(fname, sizeof(fname), "%s/pg_hba.conf", pgdata);
|
res = snprintf(fname, sizeof(fname), "%s/pg_hba.conf", pgdata);
|
||||||
if (res < 0 || res >= sizeof(fname) - 1)
|
if (res < 0 || res >= sizeof(fname))
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
* Truncating this name is a fatal error, because we must not fail to
|
* Truncating this name is a fatal error, because we must not fail to
|
||||||
|
@ -63,20 +63,32 @@ psql_start_test(const char *testname,
|
|||||||
add_stringlist_item(expectfiles, expectfile);
|
add_stringlist_item(expectfiles, expectfile);
|
||||||
|
|
||||||
if (launcher)
|
if (launcher)
|
||||||
|
{
|
||||||
offset += snprintf(psql_cmd + offset, sizeof(psql_cmd) - offset,
|
offset += snprintf(psql_cmd + offset, sizeof(psql_cmd) - offset,
|
||||||
"%s ", launcher);
|
"%s ", launcher);
|
||||||
|
if (offset >= sizeof(psql_cmd))
|
||||||
|
{
|
||||||
|
fprintf(stderr, _("command too long\n"));
|
||||||
|
exit(2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
offset += snprintf(psql_cmd + offset, sizeof(psql_cmd) - offset,
|
||||||
|
"\"%s%spsql\" -X -a -q -d \"%s\" < \"%s\" > \"%s\" 2>&1",
|
||||||
|
bindir ? bindir : "",
|
||||||
|
bindir ? "/" : "",
|
||||||
|
dblist->str,
|
||||||
|
infile,
|
||||||
|
outfile);
|
||||||
|
if (offset >= sizeof(psql_cmd))
|
||||||
|
{
|
||||||
|
fprintf(stderr, _("command too long\n"));
|
||||||
|
exit(2);
|
||||||
|
}
|
||||||
|
|
||||||
appnameenv = psprintf("PGAPPNAME=pg_regress/%s", testname);
|
appnameenv = psprintf("PGAPPNAME=pg_regress/%s", testname);
|
||||||
putenv(appnameenv);
|
putenv(appnameenv);
|
||||||
|
|
||||||
snprintf(psql_cmd + offset, sizeof(psql_cmd) - offset,
|
|
||||||
"\"%s%spsql\" -X -a -q -d \"%s\" < \"%s\" > \"%s\" 2>&1",
|
|
||||||
bindir ? bindir : "",
|
|
||||||
bindir ? "/" : "",
|
|
||||||
dblist->str,
|
|
||||||
infile,
|
|
||||||
outfile);
|
|
||||||
|
|
||||||
pid = spawn_process(psql_cmd);
|
pid = spawn_process(psql_cmd);
|
||||||
|
|
||||||
if (pid == INVALID_PID)
|
if (pid == INVALID_PID)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user