Fix incorrect message-printing in win32security.c.

log_error() would probably fail completely if used, and would
certainly print garbage for anything that needed to be interpolated
into the message, because it was failing to use the correct printing
subroutine for a va_list argument.

This bug likely went undetected because the error cases this code
is used for are rarely exercised - they only occur when Windows
security API calls fail catastrophically (out of memory, security
subsystem corruption, etc).

The FRONTEND variant can be fixed just by calling vfprintf()
instead of fprintf().  However, there was no va_list variant
of write_stderr(), so create one by refactoring that function.
Following the usual naming convention for such things, call
it vwrite_stderr().

Author: Bryan Green <[email protected]>
Reviewed-by: Tom Lane <[email protected]>
Discussion: https://postgr.es/m/CAF+pBj8goe4fRmZ0V3Cs6eyWzYLvK+HvFLYEYWG=TzaM+tWPnw@mail.gmail.com
Backpatch-through: 13

diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index dc0b74dc30b5effdda9547422b6f75e080371b6d..d78f3ab8a30dda6d344385a754e2917c8923638b 100644 (file)
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -3783,13 +3783,24 @@ write_stderr(const char *fmt,...)
 {
    va_list     ap;
 
+   va_start(ap, fmt);
+   vwrite_stderr(fmt, ap);
+   va_end(ap);
+}
+
+
+/*
+ * Write errors to stderr (or by equal means when stderr is
+ * not available) - va_list version
+ */
+void
+vwrite_stderr(const char *fmt, va_list ap)
+{
 #ifdef WIN32
    char        errbuf[2048];   /* Arbitrary size? */
 #endif
 
    fmt = _(fmt);
-
-   va_start(ap, fmt);
 #ifndef WIN32
    /* On Unix, we just fprintf to stderr */
    vfprintf(stderr, fmt, ap);
@@ -3812,5 +3823,4 @@ write_stderr(const char *fmt,...)
        fflush(stderr);
    }
 #endif
-   va_end(ap);
 }

diff --git a/src/include/utils/elog.h b/src/include/utils/elog.h
index 675f4f5f4694dd395bd3d3c016e0a20fc762fe3d..581b39091e0c60fdac5c72eca80fdab5c4fc5048 100644 (file)
--- a/src/include/utils/elog.h
+++ b/src/include/utils/elog.h
@@ -527,5 +527,6 @@ extern void write_jsonlog(ErrorData *edata);
  * safely (memory context, GUC load etc)
  */
 extern void write_stderr(const char *fmt,...) pg_attribute_printf(1, 2);
+extern void vwrite_stderr(const char *fmt, va_list ap) pg_attribute_printf(1, 0);
 
 #endif                         /* ELOG_H */

diff --git a/src/port/win32security.c b/src/port/win32security.c
index a46b82dd0482b15f670781a5c32739ea2446e9dd..b7608ab1706226d1173b11213846517b4a10d154 100644 (file)
--- a/src/port/win32security.c
+++ b/src/port/win32security.c
@@ -31,9 +31,9 @@ log_error(const char *fmt,...)
 
    va_start(ap, fmt);
 #ifndef FRONTEND
-   write_stderr(fmt, ap);
+   vwrite_stderr(fmt, ap);
 #else
-   fprintf(stderr, fmt, ap);
+   vfprintf(stderr, fmt, ap);
 #endif
    va_end(ap);
 }