From 0be405c239d30aeb1c822740e844fb856ec3639e Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 7 Aug 2002 19:32:54 +0000 Subject: [PATCH] 2002-08-07 Jakub Jelinek * malloc/malloc.c (public_cALLOc): Check ELEM_SIZE != 0 before division. * include/getopt.h: Put private decls inside [_GETOPT_H]. --- ChangeLog | 7 ++++++- malloc/malloc.c | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ae69ec5..cf5e339 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ +2002-08-07 Jakub Jelinek + + * malloc/malloc.c (public_cALLOc): Check ELEM_SIZE != 0 before + division. + 2002-08-06 Roland McGrath - * include/getopt.h: But private decls inside [_GETOPT_H]. + * include/getopt.h: Put private decls inside [_GETOPT_H]. Use libc_hidden_proto for getopt_long, getopt_long_only. * posix/getopt1.c [_LIBC]: Include instead of "getopt.h". Add libc_hidden_def. diff --git a/malloc/malloc.c b/malloc/malloc.c index 6855149..b6fd367 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -3474,7 +3474,7 @@ public_cALLOc(size_t n, size_t elem_size) #define HALF_INTERNAL_SIZE_T \ (((INTERNAL_SIZE_T) 1) << (8 * sizeof (INTERNAL_SIZE_T) / 2)) if (__builtin_expect ((n | elem_size) >= HALF_INTERNAL_SIZE_T, 0)) { - if (bytes / elem_size != n) { + if (elem_size != 0 && bytes / elem_size != n) { MALLOC_FAILURE_ACTION; return 0; } -- 2.7.4