diff options
| author | H. Peter Anvin (Intel) <hpa@zytor.com> | 2019-08-16 00:29:04 -0700 |
|---|---|---|
| committer | H. Peter Anvin (Intel) <hpa@zytor.com> | 2019-08-16 00:41:29 -0700 |
| commit | 5bb35772b3008805ba7a212d19098cead9abf1d4 (patch) | |
| tree | 719c01e8d92aa24ec2b8d2d4d5dfc838501e51a0 /include | |
| parent | 16a3e8ddb9fa6730288a586db34d768d31bd3014 (diff) | |
| download | nasm-5bb35772b3008805ba7a212d19098cead9abf1d4.tar.gz nasm-5bb35772b3008805ba7a212d19098cead9abf1d4.tar.xz nasm-5bb35772b3008805ba7a212d19098cead9abf1d4.zip | |
BR 3392597: the system malloc() can return NULL
malloc(0) can legitimately return NULL; it does on some systems and
not others. Force the size to 1 byte if the size is 0 coming in,
except for realloc() where this is legitimate and equivalent to
free().
Since this is an abnormal case, and can't even happen with most C
libraries, handle it on the error path, after we already got back a
NULL pointer.
Reported-by: Ozkan Sezer <sezeroz@gmail.com>
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/nasmlib.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/nasmlib.h b/include/nasmlib.h index eb3a637d..2e2519f5 100644 --- a/include/nasmlib.h +++ b/include/nasmlib.h @@ -109,7 +109,7 @@ static inline size_t nasm_last_string_size(void) #define nasm_assert_pointer(p) ((void)sizeof(*(p))) #define nasm_new(p) ((p) = nasm_zalloc(sizeof(*(p)))) -#define nasm_newn(p,n) ((p) = nasm_calloc(sizeof(*(p)),(n))) +#define nasm_newn(p,n) ((p) = nasm_calloc((n), sizeof(*(p)))) /* * This is broken on platforms where there are pointers which don't * match void * in their internal layout. It unfortunately also |