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

diff --git a/src/backend/libpq/ip.c b/src/backend/libpq/ip.c
index 9591ed286242dd0d2155e4d0a6c68d241198a2da..d490a82e72adfeb3eee24085d89ec44e669ae344 100644 (file)
--- a/src/backend/libpq/ip.c
+++ b/src/backend/libpq/ip.c
@@ -240,7 +240,7 @@ getnameinfo_unix(const struct sockaddr_un * sa, int salen,
                                 char *service, int servicelen,
                                 int flags)
 {
-       int                     ret = -1;
+       int                     ret;
 
        /* Invalid arguments. */
        if (sa == NULL || sa->sun_family != AF_UNIX ||
@@ -250,14 +250,14 @@ getnameinfo_unix(const struct sockaddr_un * sa, int salen,
        if (node)
        {
                ret = snprintf(node, nodelen, "%s", "[local]");
-               if (ret == -1 || ret > nodelen)
+               if (ret < 0 || ret >= nodelen)
                        return EAI_MEMORY;
        }
 
        if (service)
        {
                ret = snprintf(service, servicelen, "%s", sa->sun_path);
-               if (ret == -1 || ret > servicelen)
+               if (ret < 0 || ret >= servicelen)
                        return EAI_MEMORY;
        }
 

diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c
index 77dbf4f92ff80206f63ad638f74e7031b40a3c83..8bdd5d0021e67f6a40764bb5c26c0af204ebfb36 100644 (file)
--- a/src/backend/postmaster/pgstat.c
+++ b/src/backend/postmaster/pgstat.c
@@ -4070,7 +4070,7 @@ get_dbstat_filename(bool permanent, bool tempname, Oid databaseid,
                                           pgstat_stat_directory,
                                           databaseid,
                                           tempname ? "tmp" : "stat");
-       if (printed > len)
+       if (printed >= len)
                elog(ERROR, "overlength pgstat path");
 }
 

diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 0b403a327295802ffbad871be4bde8307bf195fe..f33160bf69c2b40c041d426a03969ac21e11f3ea 100644 (file)
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -9047,6 +9047,8 @@ do_serialize(char **destptr, Size *maxbytes, const char *fmt,...)
        if (*maxbytes <= 0)
                elog(ERROR, "not enough space to serialize GUC state");
 
+       errno = 0;
+
        va_start(vargs, fmt);
        n = vsnprintf(*destptr, *maxbytes, fmt, vargs);
        va_end(vargs);

diff --git a/src/interfaces/ecpg/pgtypeslib/common.c b/src/interfaces/ecpg/pgtypeslib/common.c
index 7adca66618d8d9dc8c2cea90a922acc045f89cd1..998764d6627de4a39be130ffb457afe00546e6b2 100644 (file)
--- a/src/interfaces/ecpg/pgtypeslib/common.c
+++ b/src/interfaces/ecpg/pgtypeslib/common.c
@@ -110,7 +110,7 @@ pgtypes_fmt_replace(union un_fmt_comb replace_val, int replace_type, char **outp
                                                break;
                                }
 
-                               if (i < 0)
+                               if (i < 0 || i >= PGTYPES_FMT_NUM_MAX_DIGITS)
                                {
                                        free(t);
                                        return -1;

diff --git a/src/port/getaddrinfo.c b/src/port/getaddrinfo.c
index 90c1b877eb4a026702df4c2a4eafe2b80b9aad6c..d04865284e28168ea4d4947c5270207fed7b73aa 100644 (file)
--- a/src/port/getaddrinfo.c
+++ b/src/port/getaddrinfo.c
@@ -404,7 +404,7 @@ getnameinfo(const struct sockaddr * sa, int salen,
                        ret = snprintf(service, servicelen, "%d",
                                                   ntohs(((struct sockaddr_in *) sa)->sin_port));
                }
-               if (ret == -1 || ret >= servicelen)
+               if (ret < 0 || ret >= servicelen)
                        return EAI_MEMORY;
        }
 

diff --git a/src/test/isolation/isolation_main.c b/src/test/isolation/isolation_main.c
index a0bd92f374761aaa009588d7b3bf9890aa6b1235..a41aeeb834fb216164c34907205219198dc540d7 100644 (file)
--- a/src/test/isolation/isolation_main.c
+++ b/src/test/isolation/isolation_main.c
@@ -73,15 +73,27 @@ isolation_start_test(const char *testname,
        add_stringlist_item(expectfiles, expectfile);
 
        if (launcher)
+       {
                offset += snprintf(psql_cmd + offset, sizeof(psql_cmd) - offset,
                                                   "%s ", launcher);
+               if (offset >= sizeof(psql_cmd))
+               {
+                       fprintf(stderr, _("command too long\n"));
+                       exit(2);
+               }
+       }
 
-       snprintf(psql_cmd + offset, sizeof(psql_cmd) - offset,
-                        "\"%s\" \"dbname=%s\" < \"%s\" > \"%s\" 2>&1",
-                        isolation_exec,
-                        dblist->str,
-                        infile,
-                        outfile);
+       offset += snprintf(psql_cmd + offset, sizeof(psql_cmd) - offset,
+                                          "\"%s\" \"dbname=%s\" < \"%s\" > \"%s\" 2>&1",
+                                          isolation_exec,
+                                          dblist->str,
+                                          infile,
+                                          outfile);
+       if (offset >= sizeof(psql_cmd))
+       {
+               fprintf(stderr, _("command too long\n"));
+               exit(2);
+       }
 
        pid = spawn_process(psql_cmd);
 

diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
index 15690177e0ff177427d758c225d37dd86ece5f22..8a782324453b03cab760c3a6abef6bb6f03702fc 100644 (file)
--- a/src/test/regress/pg_regress.c
+++ b/src/test/regress/pg_regress.c
@@ -998,7 +998,7 @@ config_sspi_auth(const char *pgdata)
        } while (0)
 
        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

diff --git a/src/test/regress/pg_regress_main.c b/src/test/regress/pg_regress_main.c
index d9591c0608c931225151204bb8346cb0d66078d7..df4f01bf372224640c74d7ebf56ecfaa658b0096 100644 (file)
--- a/src/test/regress/pg_regress_main.c
+++ b/src/test/regress/pg_regress_main.c
@@ -60,16 +60,28 @@ psql_start_test(const char *testname,
        add_stringlist_item(expectfiles, expectfile);
 
        if (launcher)
+       {
                offset += snprintf(psql_cmd + offset, sizeof(psql_cmd) - offset,
                                                   "%s ", launcher);
+               if (offset >= sizeof(psql_cmd))
+               {
+                       fprintf(stderr, _("command too long\n"));
+                       exit(2);
+               }
+       }
 
-       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);
+       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);
+       }
 
        pid = spawn_process(psql_cmd);