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

Prevent string underflow in fruit name matching

Browse Source
This commit is contained in:
Pasi Kallinen
2015-11-01 01:42:57 +02:00
parent 0261bbf727
commit 6399347d9f
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/options.c
+12 -2
View File
@@ -5106,6 +5106,16 @@ const char *str;
return; return;
} }
boolean
str_end_is(str, chkstr)
char *str, *chkstr;
{
int clen = strlen(chkstr);
if (strlen(str) >= clen)
return !strncmp(eos(str) - clen, chkstr, clen);
return FALSE;
}
/* Returns the fid of the fruit type; if that type already exists, it /* Returns the fid of the fruit type; if that type already exists, it
* returns the fid of that one; if it does not exist, it adds a new fruit * returns the fid of that one; if it does not exist, it adds a new fruit
* type to the chain and returns the new one. * type to the chain and returns the new one.
@@ -5165,8 +5175,8 @@ struct fruit *replace_fruit;
&& (!strcmp(str + 7, "spinach") && (!strcmp(str + 7, "spinach")
|| name_to_mon(str + 7) >= LOW_PM)) || name_to_mon(str + 7) >= LOW_PM))
|| !strcmp(str, "empty tin") || !strcmp(str, "empty tin")
|| ((!strncmp(eos(str) - 7, " corpse", 7) || ((str_end_is(str, " corpse")
|| !strncmp(eos(str) - 4, " egg", 4)) || str_end_is(str, " egg"))
&& name_to_mon(str) >= LOW_PM)) { && name_to_mon(str) >= LOW_PM)) {
Strcpy(buf, pl_fruit); Strcpy(buf, pl_fruit);
Strcpy(pl_fruit, "candied "); Strcpy(pl_fruit, "candied ");