From: Matthieu Moy Date: Thu, 17 Sep 2015 16:28:33 +0000 (+0200) Subject: strtoul_ui: reject negative values X-Git-Tag: v2.7.0-rc0~137^2~14 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e6f2599cbade92bcbb831d8e4845ab6f6211176c strtoul_ui: reject negative values strtoul_ui uses strtoul to get a long unsigned, then checks that casting to unsigned does not lose information and return the casted value. On 64 bits architecture, checking that the cast does not change the value catches most errors, but when sizeof(int) == sizeof(long) (e.g. i386), the check does nothing. Unfortunately, strtoul silently accepts negative values, and as a result strtoul_ui("-1", ...) raised no error. This patch catches negative values before it's too late, i.e. before calling strtoul. Reported-by: Max Kirillov Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano --- diff --git a/git-compat-util.h b/git-compat-util.h index c6d391f864..4515c494ee 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -812,6 +812,9 @@ static inline int strtoul_ui(char const *s, int base, unsigned int *result) char *p; errno = 0; + /* negative values would be accepted by strtoul */ + if (strchr(s, '-')) + return -1; ul = strtoul(s, &p, base); if (errno || *p || p == s || (unsigned int) ul != ul) return -1;