RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
Willy Tarreau 2016-11-26 15:55:59 +01:00
parent b3e111b4fd
commit ddc3e9e55d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/proto/stats.h
View File

@ -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) 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) static inline struct field mkf_s32(uint32_t type, int32_t value)