From ec3fd80b9fb1ab01ab90af7337343b376131a5f8 Mon Sep 17 00:00:00 2001 From: Peter Stamfest Date: Mon, 1 Sep 2014 20:35:48 +0200 Subject: [PATCH] Avoid some valgrind errors to be either detected to be supressed. --- src/rrd_snprintf.c | 6 ++++-- tests/valgrind-supressions | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/rrd_snprintf.c b/src/rrd_snprintf.c index 0fd4f026..d275e689 100644 --- a/src/rrd_snprintf.c +++ b/src/rrd_snprintf.c @@ -1112,8 +1112,10 @@ fmtflt(char *str, size_t *len, size_t size, LDOUBLE fvalue, int width, UINTMAX_T fracpart; UINTMAX_T mask; const char *infnan = NULL; - char iconvert[MAX_CONVERT_LENGTH]; - char fconvert[MAX_CONVERT_LENGTH]; + /* NOTE: We init the following variables, because valgrind complains + * about them being used uninitialized in some cases. */ + char iconvert[MAX_CONVERT_LENGTH] = ""; + char fconvert[MAX_CONVERT_LENGTH] = ""; char econvert[5]; /* "e-300" (without nul-termination). */ char esign = 0; char sign = 0; diff --git a/tests/valgrind-supressions b/tests/valgrind-supressions index 082e97e3..dd0aee5a 100644 --- a/tests/valgrind-supressions +++ b/tests/valgrind-supressions @@ -5,3 +5,17 @@ fun:pixman_constructor ... } +{ + g_regex_new + Memcheck:Leak + ... + fun:g_once_init_enter + ... +} +{ + g_regex_new + Memcheck:Leak + ... + fun:g_once_init_leave + ... +} -- 2.47.3