lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

2002-08-07 Jakub Jelinek <jakub@redhat.com>

Browse Source 
* malloc/malloc.c (public_cALLOc): Check ELEM_SIZE != 0 before
	division.

	* include/getopt.h: Put private decls inside [_GETOPT_H].
This commit is contained in:
Roland McGrath
2002-08-07 19:32:54 +00:00
parent e78f615d52
commit 0be405c239
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,6 +1,11 @@
2002-08-07 Jakub Jelinek <jakub@redhat.com>
* malloc/malloc.c (public_cALLOc): Check ELEM_SIZE != 0 before
division.
2002-08-06 Roland McGrath <roland@redhat.com> 2002-08-06 Roland McGrath <roland@redhat.com>
* 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. Use libc_hidden_proto for getopt_long, getopt_long_only.
* posix/getopt1.c [_LIBC]: Include <getopt.h> instead of "getopt.h". * posix/getopt1.c [_LIBC]: Include <getopt.h> instead of "getopt.h".
Add libc_hidden_def. Add libc_hidden_def.

2
malloc/malloc.c
View File

@ -3474,7 +3474,7 @@ public_cALLOc(size_t n, size_t elem_size)
#define HALF_INTERNAL_SIZE_T \ #define HALF_INTERNAL_SIZE_T \
(((INTERNAL_SIZE_T) 1) << (8 * sizeof (INTERNAL_SIZE_T) / 2)) (((INTERNAL_SIZE_T) 1) << (8 * sizeof (INTERNAL_SIZE_T) / 2))
if (__builtin_expect ((n | elem_size) >= HALF_INTERNAL_SIZE_T, 0)) { 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; MALLOC_FAILURE_ACTION;
return 0; return 0;
} }