From 64126925181809e7c0b8916471186c0bfa19d6ce Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 23 Jun 2020 09:10:25 +0200 Subject: [PATCH] parse-util: backport safe_atou32_full() We need this for a follow up security fix. (cherry picked from commit b934ac3d6e7dcad114776ef30ee9098693e7ab7e) --- src/basic/parse-util.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/basic/parse-util.h b/src/basic/parse-util.h index 6b30c727e3..36d76ba576 100644 --- a/src/basic/parse-util.h +++ b/src/basic/parse-util.h @@ -45,9 +45,13 @@ static inline int safe_atoux16(const char *s, uint16_t *ret) { int safe_atoi16(const char *s, int16_t *ret); -static inline int safe_atou32(const char *s, uint32_t *ret_u) { +static inline int safe_atou32_full(const char *s, unsigned base, uint32_t *ret_u) { assert_cc(sizeof(uint32_t) == sizeof(unsigned)); - return safe_atou(s, (unsigned*) ret_u); + return safe_atou_full(s, base, (unsigned*) ret_u); +} + +static inline int safe_atou32(const char *s, uint32_t *ret_u) { + return safe_atou32_full(s, 0, (unsigned*) ret_u); } static inline int safe_atoi32(const char *s, int32_t *ret_i) { -- 2.25.1