nxcompshad: fix logging segfault

One cannot simply pass down a va_list to another function that expects variable arguments ("..."). The prototype of the called functions must expect a va_list argument instead. This fixes segfaults that happen e.g. after compiling X11.cpp with TEST and effectively reverts 59e829f3.

nxcompshad: fix logging segfault
506378cf · Ulrich Sibiller · Mike Gabriel · df9d37da · 506378cf · 506378cf
Commit 506378cf authored Sep 18, 2019 by Ulrich Sibiller Committed by Mike Gabriel Sep 29, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 20 deletions

Logger.cpp nxcompshad/src/Logger.cpp +4 -16

Logger.h nxcompshad/src/Logger.h +4 -4

No files found.
--- a/nxcompshad/src/Logger.cpp
+++ b/nxcompshad/src/Logger.cpp
@@ -41,14 +41,11 @@

 Logger logger;

-void Logger::user(const char *format, ...)
+void Logger::user(const char *format, va_list arguments)
 {
  char string[1024];

-  va_list arguments;
-  va_start(arguments, format);
  vsnprintf(string, 1024, format, arguments);
-  va_end(arguments);

  fprintf(stderr, "%s\n", string);
 }
@@ -59,26 +56,20 @@ void Logger::error(const char *name, int error)
               name, error, strerror(error));
 }

-void Logger::warning(const char *name, const char *format, ...)
+void Logger::warning(const char *name, const char *format, va_list arguments)
 {
  char string[1024];

-  va_list arguments;
-  va_start(arguments, format);
  vsnprintf(string, 1024, format, arguments);
-  va_end(arguments);

  fprintf(stderr, "%s: WARNING! %s\n", name, string);
 }

-void Logger::test(const char *name, const char *format, ...)
+void Logger::test(const char *name, const char *format, va_list arguments)
 {
  char string[1024];

-  va_list arguments;
-  va_start(arguments, format);
  vsnprintf(string, 1024, format, arguments);
-  va_end(arguments);

  fprintf(stderr, "%s: %s\n", name, string);
 }
@@ -88,14 +79,11 @@ void Logger::trace(const char *name)
  fprintf(stderr, "%s\n", name);
 }

-void Logger::debug(const char *name, const char *format, ...)
+void Logger::debug(const char *name, const char *format, va_list arguments)
 {
  char string[1024];

-  va_list arguments;
-  va_start(arguments, format);
  vsnprintf(string, 1024, format, arguments);
-  va_end(arguments);

  fprintf(stderr, "%s: %s\n", name, string);
 }

--- a/nxcompshad/src/Logger.h
+++ b/nxcompshad/src/Logger.h
@@ -43,17 +43,17 @@ class Logger
 {
  public:

-  void user(const char *format, ...) __attribute__((format(printf, 2, 0)));
+  void user(const char *format, va_list arguments) __attribute__((format(printf, 2, 0)));

  void error(const char *name, int error);

-  void warning(const char *name, const char *format, ...) __attribute__((format(printf, 3, 0)));
+  void warning(const char *name, const char *format, va_list arguments) __attribute__((format(printf, 3, 0)));

-  void test(const char *name, const char *format, ...) __attribute__((format(printf, 3, 0)));
+  void test(const char *name, const char *format, va_list arguments) __attribute__((format(printf, 3, 0)));

  void trace(const char *name);

-  void debug(const char *name, const char *format, ...) __attribute__((format(printf, 3, 0)));
+  void debug(const char *name, const char *format, va_list arguments) __attribute__((format(printf, 3, 0)));

  void dump(const char *name, const char *data, int size);
 };