nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

alloc(0)

Browse Source 
Have alloc() treat a request for 0 bytes as if it was one for
'sizeof (long)' bytes so that the issue of malloc(0) maybe yielding
NULL becomes moot.

I think instances of attempting to allocate 0 bytes should probably
still be checked for and made to avoid calling alloc(0).  Assuming
that alloc() will clean up requests for nothing feels sloppy.
This commit is contained in:
PatR
2024-01-23 23:56:29 -08:00
parent 78252de3bc
commit ab4991930a
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/alloc.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 alloc.c $NHDT-Date: 1703716159 2023/12/27 22:29:19 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.32 $ */
/* NetHack 3.7 alloc.c $NHDT-Date: 1706082987 2024/01/24 07:56:27 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.33 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2012. */
/* NetHack may be freely redistributed. See license for details. */
@@ -41,11 +41,13 @@ static boolean tried_heaplog = FALSE;
* recognizes that the following manipulation overcomes that via
* rounding the requested length up to the next long. NetHack doesn't
* make a lot of tiny allocations, so this shouldn't waste much memory
* regardless of whether malloc() does something similar.
* regardless of whether malloc() does something similar. NetHack
* isn't expected to call alloc(0), but if that happens treat it as
* alloc(sizeof (long)) instead.
*/
#define ForceAlignedLength(LTH) \
do { \
if ((LTH) % sizeof (long) != 0) \
if (!(LTH) || (LTH) % sizeof (long) != 0) \
(LTH) += sizeof (long) - (LTH) % sizeof (long); \
} while (0)