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

fix reported stack corruption bug during Call

Browse Source 
Fix an issue reported as github #74.
Some guard code was required to prevent writing past end of qbuf
via a sprintf.
This commit is contained in:
nhmall
2018-02-19 10:19:44 -05:00
parent 48af4fa259
commit 0301420fcb
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/do_name.c
+11 -4
View File
@@ -1415,12 +1415,19 @@ register struct obj *obj;
otemp.quan = 1L; otemp.quan = 1L;
otemp.oextra = (struct oextra *) 0; otemp.oextra = (struct oextra *) 0;
if (objects[otemp.otyp].oc_class == POTION_CLASS && otemp.fromsink) if (objects[otemp.otyp].oc_class == POTION_CLASS && otemp.fromsink) {
/* kludge, meaning it's sink water */ /* kludge, meaning it's sink water */
Sprintf(qbuf, "Call a stream of %s fluid:", Sprintf(qbuf, "Call a stream of %s fluid:",
OBJ_DESCR(objects[otemp.otyp])); OBJ_DESCR(objects[otemp.otyp]));
else } else {
Sprintf(qbuf, "Call %s:", an(xname(&otemp))); char tmpbuf[BUFSZ], *tmpname = an(xname(&otemp));
if (strlen(tmpname) < (BUFSZ - 1)) {
Strcpy(tmpbuf, tmpname);
tmpbuf[QBUFSZ - 7] = '\0'; /* need room for "Call :"*/
Sprintf(qbuf, "Call %s:", tmpbuf);
}
}
getlin(qbuf, buf); getlin(qbuf, buf);
if (!*buf || *buf == '\033') if (!*buf || *buf == '\033')
return; return;