mirror of
http://git.haproxy.org/git/haproxy.git/
synced 2024-12-23 21:22:17 +00:00
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.
This commit is contained in:
parent
b3e111b4fd
commit
ddc3e9e55d
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user