From: Willy Tarreau <w@1wt.eu>
Date: Sat, 26 Nov 2016 14:55:59 +0000 (+0100)
Subject: BUG/MINOR: stats: make field_str() return an empty string on NULL
X-Git-Tag: v1.8-dev1~318
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddc3e9e55de965432946c7d13c52756f71eb06b5;p=thirdparty%2Fhaproxy.git

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.
---

diff --git a/include/proto/stats.h b/include/proto/stats.h
index 7fab87d07c..ac893b843c 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)