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

useupall really won't handle a NULL pointer

Browse Source 
Revert useupall() prototype back to NONNULLARG1, as it was.
The callers in nhlua.c check gi.invent to be nonnull before
calling useupall().
This commit is contained in:
nhmall
2023-12-20 19:31:39 -05:00
parent a696cb8d90
commit d0e43523d7
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/extern.h
View File

@@ -1238,8 +1238,9 @@ extern struct obj *addinv_before(struct obj *, struct obj *) NONNULLARG1;
extern struct obj *addinv_nomerge(struct obj *) NONNULLARG1; extern struct obj *addinv_nomerge(struct obj *) NONNULLARG1;
extern struct obj *hold_another_object(struct obj *, const char *, extern struct obj *hold_another_object(struct obj *, const char *,
const char *, const char *) NONNULLARG1; const char *, const char *) NONNULLARG1;
/* sometimes useupall(gi.invent) which can be null */ /* nhlua.c calls useupall(gi.invent), but checks gi.invent against NULL
extern void useupall(struct obj *) NO_NONNULLS; * before doing so. useupall() won't handle NULL*/
extern void useupall(struct obj *) NONNULLARG1;
extern void useup(struct obj *) NONNULLARG1; extern void useup(struct obj *) NONNULLARG1;
extern void consume_obj_charge(struct obj *, boolean) NONNULLARG1; extern void consume_obj_charge(struct obj *, boolean) NONNULLARG1;
extern void freeinv_core(struct obj *) NONNULLARG1; extern void freeinv_core(struct obj *) NONNULLARG1;