From b6fbd4d50dd30e90231bb0b2f8ddf9fd96691b39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= Date: Sun, 15 Aug 2010 14:55:32 +0000 Subject: [PATCH] no-op commit to note that the example given in the previous commit is a very bad one, since the shift does not actually overflow. This is a better example (assuming uint64_t = unsigned long long): ~0LLU >> 9 = 0x7fffffffffffffLLU ~0LLU >> 9 << 10 = 0xfffffffffffffc00LLU ~0LLU >> 9 << 10 >> 10 = 0x3fffffffffffffLLU --- lib/libutil/expand_number.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libutil/expand_number.c b/lib/libutil/expand_number.c index 9bb0308d1415..30a292ef64c2 100644 --- a/lib/libutil/expand_number.c +++ b/lib/libutil/expand_number.c @@ -66,7 +66,7 @@ expand_number(const char *buf, uint64_t *num) return (0); } -#define SHIFT(n, b) \ +#define SHIFT(n, b) \ do { if (((n << b) >> b) != n) goto overflow; n <<= b; } while (0) switch (tolower((unsigned char)*endptr)) {