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

add null-check on fill_special_room()

Browse Source 
Add null-check of croom before its first use.
This commit is contained in:
SHIRAKATA Kentaro
2022-02-08 17:20:50 +09:00
parent a0100dd300
commit cf4cc3fa93
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/sp_lev.c
View File

@@ -2588,6 +2588,9 @@ fill_special_room(struct mkroom* croom)
{ {
int i; int i;
if (!croom)
return;
/* First recurse into subrooms. We don't want to block an ordinary room with /* First recurse into subrooms. We don't want to block an ordinary room with
* a special subroom from having the subroom filled, or an unfilled outer * a special subroom from having the subroom filled, or an unfilled outer
* room preventing a special subroom from being filled. */ * room preventing a special subroom from being filled. */
@@ -2595,7 +2598,7 @@ fill_special_room(struct mkroom* croom)
fill_special_room(croom->sbrooms[i]); fill_special_room(croom->sbrooms[i]);
} }
if (!croom || croom->rtype == OROOM || croom->rtype == THEMEROOM if (croom->rtype == OROOM || croom->rtype == THEMEROOM
|| croom->needfill == FILL_NONE) || croom->needfill == FILL_NONE)
return; return;