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

move null-check on tin_details()

Browse Source 
Move null-check of obj and buf before their first use.
This commit is contained in:
SHIRAKATA Kentaro
2022-02-10 05:16:29 +09:00
parent 445573a01f
commit 9bd8bcdcfb
1 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/eat.c
+4 -2
View File
@@ -1237,9 +1237,12 @@ void
tin_details(struct obj *obj, int mnum, char *buf) tin_details(struct obj *obj, int mnum, char *buf)
{ {
char buf2[BUFSZ]; char buf2[BUFSZ];
if (!obj || !buf)
return;
int r = tin_variety(obj, TRUE); int r = tin_variety(obj, TRUE);
if (obj && buf) {
if (r == SPINACH_TIN) if (r == SPINACH_TIN)
Strcat(buf, " of spinach"); Strcat(buf, " of spinach");
else if (mnum == NON_PM) else if (mnum == NON_PM)
@@ -1261,7 +1264,6 @@ tin_details(struct obj *obj, int mnum, char *buf)
else else
Sprintf(eos(buf), "%s meat", mons[mnum].pmnames[NEUTRAL]); Sprintf(eos(buf), "%s meat", mons[mnum].pmnames[NEUTRAL]);
} }
}
} }
void void