From: Willy Tarreau <w@1wt.eu>
Date: Fri, 14 May 2021 06:51:53 +0000 (+0200)
Subject: BUILD: sample: use strtoll() instead of atoll()
X-Git-Tag: v2.4.0~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb601956db501a4ac4e6ea37cc264203bf38aa3c;p=thirdparty%2Fhaproxy.git

BUILD: sample: use strtoll() instead of atoll()

atoll() is not portable, but strtoll() is more common. We must pass NULL
to the end pointer however since the parser must consume digits and stop
at the first non-digit char. No backport is needed as this was introduced
in 2.4-dev17 with commit 51c8ad45c ("MINOR: sample: converter: Add json_query
converter").
---

diff --git a/src/sample.c b/src/sample.c
index 08c5283f5e..09c272c48b 100644
--- a/src/sample.c
+++ b/src/sample.c
@@ -3743,7 +3743,7 @@ static int sample_conv_json_query(const struct arg *args, struct sample *smp, vo
 	switch (token_type) {
 		case MJSON_TOK_NUMBER:
 			if (args[1].type == ARGT_SINT) {
-				smp->data.u.sint = atoll(token);
+				smp->data.u.sint = strtoll(token, NULL, 0);
 
 				if (smp->data.u.sint < JSON_INT_MIN || smp->data.u.sint > JSON_INT_MAX)
 					return 0;