From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Sun, 28 Jun 2020 19:16:05 +0000 (-0500)
Subject: sbuff: Fix advance on integer parsing
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc4399d8d4430f6b0cd6d2ec497b79c3e088e033;p=thirdparty%2Ffreeradius-server.git

sbuff: Fix advance on integer parsing
---

diff --git a/src/lib/util/sbuff.c b/src/lib/util/sbuff.c
index 89a04bf9f30..13a7fb42cf9 100644
--- a/src/lib/util/sbuff.c
+++ b/src/lib/util/sbuff.c
@@ -430,7 +430,7 @@ size_t fr_sbuff_parse_##_name(fr_sbuff_parse_error_t *err, _type *out, fr_sbuff_
 		if (err) *err = FR_SBUFF_PARSE_ERROR_NOT_FOUND; \
 		*out = (_type)(num); \
 	} \
-	fr_sbuff_set(in, &our_in); \
+	fr_sbuff_advance(in, end - buff); /* Advance by the length strtoll gives us */ \
 	return end - buff; \
 }
 
@@ -467,7 +467,7 @@ size_t fr_sbuff_parse_##_name(fr_sbuff_parse_error_t *err, _type *out, fr_sbuff_
 		if (err) *err = FR_SBUFF_PARSE_ERROR_NOT_FOUND; \
 		*out = (_type)(num); \
 	} \
-	fr_sbuff_set(in, &our_in); \
+	fr_sbuff_advance(in, end - buff); /* Advance by the length strtoull gives us */ \
 	return end - buff; \
 }