From ddc3e9e55de965432946c7d13c52756f71eb06b5 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Sat, 26 Nov 2016 15:55:59 +0100 Subject: [PATCH] BUG/MINOR: stats: make field_str() return an empty string on NULL It already returns an empty string when the field is empty, but as a preventive measure we should do the same when the string itself is a NULL. While it is not supposed to happen, it will make the code more resistant against failed allocations and unexpected results. This fix should be backported to 1.7. --- include/proto/stats.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/proto/stats.h b/include/proto/stats.h index 7fab87d07..ac893b843 100644 --- a/include/proto/stats.h +++ b/include/proto/stats.h @@ -50,7 +50,7 @@ static inline enum field_nature field_nature(const struct field *f, int e) static inline const char *field_str(const struct field *f, int e) { - return (field_format(f, e) == FF_STR) ? f[e].u.str : ""; + return (field_format(f, e) == FF_STR && f[e].u.str) ? f[e].u.str : ""; } static inline struct field mkf_s32(uint32_t type, int32_t value)