From cff48ff751ca1ef8136695213a1a9df4f08dba38 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 26 Apr 2017 11:38:30 -0700 Subject: [PATCH] xalloc: add missing integer overflow check * lib/xalloc.h (x2nrealloc): Also check for multiplication overflow when P is null. --- ChangeLog | 6 ++++++ lib/xalloc.h | 2 ++ 2 files changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index 8010a24505..fd5ec8936e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2017-04-26 Paul Eggert + + xalloc: add missing integer overflow check + * lib/xalloc.h (x2nrealloc): Also check for multiplication + overflow when P is null. + 2017-04-25 Paul Eggert parse-datetime: make it standalone diff --git a/lib/xalloc.h b/lib/xalloc.h index 484b67f133..5cf804b44d 100644 --- a/lib/xalloc.h +++ b/lib/xalloc.h @@ -194,6 +194,8 @@ x2nrealloc (void *p, size_t *pn, size_t s) n = DEFAULT_MXFAST / s; n += !n; } + if (xalloc_oversized (n, s)) + xalloc_die (); } else { -- 2.39.5