From: Tim Duesterhus <tim@bastelstu.be>
Date: Sun, 23 Jun 2019 20:10:10 +0000 (+0200)
Subject: BUG/MINOR: log: Detect missing sampling ranges in config
X-Git-Tag: v2.1-dev1~54
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2164800c1b9382d154e9e2d0c500e77b89efee77;p=thirdparty%2Fhaproxy.git

BUG/MINOR: log: Detect missing sampling ranges in config

Consider a config like:

    global
    	log 127.0.0.1:10001 sample :10 local0

No sampling ranges are given here, leading to NULL being passed
as the first argument to qsort.

This configuration does not make sense anyway, a log without ranges
would never log. Thus output an error if no ranges are given.

This bug was introduced in d95ea2897eb951c72fd169f36b6a79905f2ed999.
This fix must be backported to HAProxy 2.0.
---

diff --git a/src/log.c b/src/log.c
index ecbc7ab559..ef999d13f5 100644
--- a/src/log.c
+++ b/src/log.c
@@ -929,6 +929,11 @@ int parse_logsrv(char **args, struct list *logsrvs, int do_del, char **err)
 			smp_rgs_sz++;
 		}
 
+		if (smp_rgs == NULL) {
+			memprintf(err, "no sampling ranges given");
+			goto error;
+		}
+
 		beg = smp_sz_str;
 		end = beg + strlen(beg);
 		new_smp_sz = read_uint((const char **)&beg, end);