RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-13 15:04:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MEDIUM: maps: only try to parse the default value when it's present

Browse Source 
Maps returning an IP address (e.g. map_str_ip) support an optional
default value which must be parsed. Unfortunately the parsing code does
not check for this argument's existence and uncondtionally tries to
resolve the argument whenever the output is of type address, resulting
in segfaults at parsing time when no such argument is provided. This
patch adds the appropriate check.

This fix may be backported as far as 1.6.
This commit is contained in:
Willy Tarreau 2019-04-19 11:35:22 +02:00
parent 88698d966d
commit aa5801bcaa
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/map.c
View File

@ -143,10 +143,10 @@ int sample_load_map(struct arg *arg, struct sample_conv *conv,
1, err, file, line))
return 0;
/* the maps of type IP have a string as defaultvalue. This
* string canbe anipv4 or an ipv6, we must convert it.
/* the maps of type IP support a string as default value. This
* string can be an ipv4 or an ipv6, we must convert it.
*/
if (desc->conv->out_type == SMP_T_ADDR) {
if (arg[1].type != ARGT_STOP && desc->conv->out_type == SMP_T_ADDR) {
struct sample_data data;
if (!map_parse_ip(arg[1].data.str.area, &data)) {
memprintf(err, "map: cannot parse default ip <%s>.",