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

avoid buffer overruns

Browse Source 
Noticed with recent looting patch:  QBUFSZ is not big enough
to reliably hold formatted object names.  (I haven't looked through
any other source files for similar problems.)
This commit is contained in:
nethack.rankin
2002-09-07 02:38:50 +00:00
parent 069703f6c3
commit 53f40d2a20
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pickup.c
+7 -6
View File
@@ -525,7 +525,7 @@ menu_pickup:
continue; continue;
if (!all_of_a_type) { if (!all_of_a_type) {
char qbuf[QBUFSZ]; char qbuf[BUFSZ];
Sprintf(qbuf, "Pick up %s?", doname(obj)); Sprintf(qbuf, "Pick up %s?", doname(obj));
switch ((obj->quan < 2L) ? ynaq(qbuf) : ynNaq(qbuf)) { switch ((obj->quan < 2L) ? ynaq(qbuf) : ynNaq(qbuf)) {
case 'q': goto end_query; /* out 2 levels */ case 'q': goto end_query; /* out 2 levels */
@@ -1108,7 +1108,7 @@ boolean telekinesis;
if (telekinesis) { if (telekinesis) {
result = 0; /* don't lift */ result = 0; /* don't lift */
} else { } else {
char qbuf[QBUFSZ]; char qbuf[BUFSZ];
long savequan = obj->quan; long savequan = obj->quan;
obj->quan = *cnt_p; obj->quan = *cnt_p;
@@ -1412,7 +1412,7 @@ doloot() /* loot a container on the floor. */
boolean underfoot = TRUE; boolean underfoot = TRUE;
const char *dont_find_anything = "don't find anything"; const char *dont_find_anything = "don't find anything";
struct monst *mtmp; struct monst *mtmp;
char qbuf[QBUFSZ]; char qbuf[BUFSZ];
int prev_inquiry = 0; int prev_inquiry = 0;
boolean prev_loot = FALSE; boolean prev_loot = FALSE;
@@ -1911,7 +1911,7 @@ register int held;
struct monst *shkp; struct monst *shkp;
boolean one_by_one, allflag, loot_out = FALSE, loot_in = FALSE; boolean one_by_one, allflag, loot_out = FALSE, loot_in = FALSE;
char select[MAXOCLASSES+1]; char select[MAXOCLASSES+1];
char qbuf[QBUFSZ], emptymsg[QBUFSZ]; char qbuf[BUFSZ], emptymsg[BUFSZ];
long loss = 0L; long loss = 0L;
int cnt = 0, used = 0, lcnt = 0, int cnt = 0, used = 0, lcnt = 0,
menu_on_request; menu_on_request;
@@ -2011,11 +2011,12 @@ register int held;
if (flags.menu_style != MENU_TRADITIONAL) { if (flags.menu_style != MENU_TRADITIONAL) {
if (flags.menu_style == MENU_FULL) { if (flags.menu_style == MENU_FULL) {
int t; int t;
char menuprompt[QBUFSZ]; char menuprompt[BUFSZ];
boolean outokay = (cnt != 0); boolean outokay = (cnt != 0);
boolean inokay = (invent != 0); boolean inokay = (invent != 0);
if (!outokay && !inokay) { if (!outokay && !inokay) {
pline("%s You don't have anything to put in.", emptymsg); pline("%s", emptymsg);
pline("You don't have anything to put in.");
return used; return used;
} }
menuprompt[0] = '\0'; menuprompt[0] = '\0';