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

Fix: crash when appending to long engraving

Browse Source 
If an engraving was appended to repeatedly, it could eventually exceed
BUFSZ and cause a crash.  Add some checks to prevent this from happening
and inform the player when she runs out of space to engrave on a
particular square.
This commit is contained in:
Michael Meyer
2021-07-21 20:07:28 -04:00
committed by Pasi Kallinen
parent b16c3732cb
commit fa8c3f82be
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/engrave.c
View File

@@ -994,6 +994,9 @@ doengrave(void)
You("will overwrite the current message.");
eow = TRUE;
}
} else if (oep && (int) strlen(oep->engr_txt) >= BUFSZ - 1) {
There("is no room to add anything else here.");
return 1;
}
}
@@ -1120,7 +1123,7 @@ engrave(void)
boolean dulling_wep, marker;
char *endc; /* points at character 1 beyond the last character to engrave
this action */
int i;
int i, space_left;
if (g.context.engraving.pos.x != u.ux
|| g.context.engraving.pos.y != u.uy) { /* teleported? */
@@ -1248,6 +1251,18 @@ engrave(void)
/* actions that happen at the end of every engraving action go here */
Strcpy(buf, "");
oep = engr_at(u.ux, u.uy);
if (oep) /* add to existing engraving */
Strcpy(buf, oep->engr_txt);
space_left = sizeof buf - (int) strlen(buf) - 1;
if (endc - g.context.engraving.nextc > space_left) {
You("run out of room to write.");
endc = g.context.engraving.nextc + space_left;
truncate = TRUE;
}
/* If the stylus did wear out mid-engraving, truncate the input so that we
* can't go any further. */
if (truncate && *endc != '\0') {
@@ -1260,12 +1275,8 @@ engrave(void)
truncate = FALSE;
}
Strcpy(buf, "");
oep = engr_at(u.ux, u.uy);
if (oep) /* add to existing engraving */
Strcpy(buf, oep->engr_txt);
(void) strncat(buf, g.context.engraving.nextc,
endc - g.context.engraving.nextc);
min(space_left, endc - g.context.engraving.nextc));
make_engr_at(u.ux, u.uy, buf, g.moves - g.multi, g.context.engraving.type);
if (*endc) {