diff options
| -rw-r--r-- | src/shared/util.c | 2 | ||||
| -rw-r--r-- | src/shared/util.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/shared/util.c b/src/shared/util.c index 02ee6374c3..be94515d9d 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -1184,7 +1184,7 @@ char *strnappend(const char *s, const char *suffix, size_t b) { assert(suffix); a = strlen(s); - if ((size_t) -1 - a > b) + if (b > ((size_t) -1) - a) return NULL; r = new(char, a+b+1); diff --git a/src/shared/util.h b/src/shared/util.h index 2e49cfde2e..e1d4735ee3 100644 --- a/src/shared/util.h +++ b/src/shared/util.h @@ -545,14 +545,14 @@ void closedirp(DIR **d); void umaskp(mode_t *u); _malloc_ static inline void *malloc_multiply(size_t a, size_t b) { - if (_unlikely_(a > ((size_t) -1) / b)) + if (_unlikely_(b == 0 || a > ((size_t) -1) / b)) return NULL; return malloc(a * b); } _malloc_ static inline void *memdup_multiply(const void *p, size_t a, size_t b) { - if (_unlikely_(a > ((size_t) -1) / b)) + if (_unlikely_(b == 0 || a > ((size_t) -1) / b)) return NULL; return memdup(p, a * b); |