Fix sink.ctf.fs: NULL dereference in logging statement

[babeltrace.git] / logging / log.c

diff --git a/logging/log.c b/logging/log.c
index 4561012984e75eb6548a78573e4d597683c1a305..1a9fed4bc486c8fcec0673daf1569d020dcbd5ad 100644 (file)
--- a/logging/log.c
+++ b/logging/log.c
@@ -310,6 +310,8 @@ extern unsigned long pthread_getsequence_np(pthread_t *);
        #include <sys/time.h>
        #if defined(__linux__)
                #include <linux/limits.h>
+       #elif (defined(__sun__) || defined(__CYGWIN__))
+               /* Solaris and Cygwin have no sys/syslimits.h */
        #else
                #include <sys/syslimits.h>
        #endif
@@ -740,7 +742,7 @@ static char lvl_char(const int lvl)
 #define TCACHE_FLUID (0x40000000 | 0x80000000)
 static unsigned g_tcache_mode = TCACHE_STALE;
 static struct timeval g_tcache_tv = {0, 0};
-static struct tm g_tcache_tm = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+static struct tm g_tcache_tm = {0};
 
 static INLINE int tcache_get(const struct timeval *const tv, struct tm *const tm)
 {
@@ -903,7 +905,7 @@ static char *put_integer_r(unsigned v, const int sign,
                                                   const unsigned w, const char wc, char *const e)
 {
        static const char _signs[] = {'-', '0', '+'};
-       static const char *const signs = _signs + 1;
+       const char *const signs = _signs + 1;
        char *p = e;
        do { *--p = '0' + v % 10; } while (0 != (v /= 10));
        if (0 == sign) return put_padding_r(w, wc, p, e);