commit 6f8dc568e6ab072bb8205b732f04e685bf9237c0 Merge: c43167cc 954ff2e2 Author: Sebastien GODARD Date: Wed May 17 21:10:31 2023 +0200 Merge branch 'pkopylov-master' Signed-off-by: Sebastien GODARD diff --git a/common.c b/common.c index 48493b5f..0efe7ee3 100644 --- a/common.c +++ b/common.c @@ -431,15 +431,17 @@ int check_dir(char *dirname) void check_overflow(unsigned int val1, unsigned int val2, unsigned int val3) { - if ((unsigned long long) val1 * (unsigned long long) val2 * - (unsigned long long) val3 > UINT_MAX) { + if ((val1 != 0) && (val2 != 0) && (val3 != 0) && + (((unsigned long long) UINT_MAX / (unsigned long long) val1 < + (unsigned long long) val2) || + ((unsigned long long) UINT_MAX / ((unsigned long long) val1 * (unsigned long long) val2) < + (unsigned long long) val3))) { #ifdef DEBUG - fprintf(stderr, "%s: Overflow detected (%llu). Aborting...\n", - __FUNCTION__, (unsigned long long) val1 * (unsigned long long) val2 * - (unsigned long long) val3); + fprintf(stderr, "%s: Overflow detected (%u,%u,%u). Aborting...\n", + __FUNCTION__, val1, val2, val3); #endif - exit(4); - } + exit(4); + } } #ifndef SOURCE_SADC