From: Willy Tarreau <w@1wt.eu>
Date: Tue, 19 Nov 2024 09:56:45 +0000 (+0100)
Subject: MINOR: ring: support unit suffixes in the size
X-Git-Tag: v3.1-dev14~113
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f8d3d2e4cf384dd8a59f1d3dd712e43c26425370;p=thirdparty%2Fhaproxy.git

MINOR: ring: support unit suffixes in the size

The ring size used to take only numbers and silently ignore letters (due
to atol()), resulting it tiny buffers when trying to collect traces and
using e.g. "size 10g". Let's make use of parse_size_err() to properly
parse units.
---

diff --git a/src/sink.c b/src/sink.c
index 0b95183883..b86c336bcd 100644
--- a/src/sink.c
+++ b/src/sink.c
@@ -976,8 +976,7 @@ int cfg_parse_ring(const char *file, int linenum, char **args, int kwm)
 			goto err;
 		}
 
-		size = atol(args[1]);
-		if (!size) {
+		if (parse_size_err(args[1], &size) != NULL || !size) {
 			ha_alert("parsing [%s:%d] : invalid size '%s' for new sink buffer.\n", file, linenum, args[1]);
 			err_code |= ERR_ALERT | ERR_FATAL;
 			goto err;