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

questpgr memory management

Browse Source 
Fix a complaint from 'heaputil' about freeing a Null pointer.  ANSI C
allows that but but older implementations could have problems.

This code is from four months ago and I don't remember how thoroughly
it was tested at that time.  It's only had minimal testing now.
This commit is contained in:
PatR
2020-05-24 03:06:18 -07:00
parent 298331fe04
commit b720b0f469
1 changed files with 45 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
src/questpgr.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 questpgr.c $NHDT-Date: 1575830005 2019/12/08 18:33:25 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.67 $ */ /* NetHack 3.6 questpgr.c $NHDT-Date: 1590314765 2020/05/24 10:06:05 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.71 $ */
/* Copyright 1991, M. Stephenson */ /* Copyright 1991, M. Stephenson */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -364,9 +364,9 @@ char *in_line, *out_line;
*cc++ = *c; *cc++ = *c;
break; break;
} }
if (cc > &out_line[BUFSZ - 1])
panic("convert_line: overflow");
} }
if (cc > &out_line[BUFSZ-1])
panic("convert_line: overflow");
*cc = 0; *cc = 0;
return; return;
} }
@@ -438,13 +438,14 @@ const char *section;
const char *msgid; const char *msgid;
boolean showerror; boolean showerror;
{ {
const char *const howtoput[] = { "pline", "window", "text", "menu", "default", NULL }; static const char *const howtoput[] = {
const int howtoput2i[] = { 1, 2, 2, 3, 0, 0 }; "pline", "window", "text", "menu", "default", NULL
};
static const int howtoput2i[] = { 1, 2, 2, 3, 0, 0 };
int output; int output;
lua_State *L; lua_State *L;
char *synopsis; char *text = NULL, *synopsis = NULL, *fallback_msgid = NULL;
char *text; boolean res = FALSE;
char *fallback_msgid = NULL;
if (skip_pager(TRUE)) if (skip_pager(TRUE))
return FALSE; return FALSE;
@@ -454,8 +455,7 @@ boolean showerror;
if (!nhl_loadlua(L, QTEXT_FILE)) { if (!nhl_loadlua(L, QTEXT_FILE)) {
if (showerror) if (showerror)
impossible("com_pager: %s not found.", QTEXT_FILE); impossible("com_pager: %s not found.", QTEXT_FILE);
lua_close(L); goto compagerdone;
return FALSE;
} }
lua_settop(L, 0); lua_settop(L, 0);
@@ -464,8 +464,7 @@ boolean showerror;
if (showerror) if (showerror)
impossible("com_pager: questtext in %s is not a lua table", impossible("com_pager: questtext in %s is not a lua table",
QTEXT_FILE); QTEXT_FILE);
lua_close(L); goto compagerdone;
return FALSE;
} }
lua_getfield(L, -1, section); lua_getfield(L, -1, section);
@@ -473,11 +472,10 @@ boolean showerror;
if (showerror) if (showerror)
impossible("com_pager: questtext[%s] in %s is not a lua table", impossible("com_pager: questtext[%s] in %s is not a lua table",
section, QTEXT_FILE); section, QTEXT_FILE);
lua_close(L); goto compagerdone;
return FALSE;
} }
tryagain: tryagain:
lua_getfield(L, -1, fallback_msgid ? fallback_msgid : msgid); lua_getfield(L, -1, fallback_msgid ? fallback_msgid : msgid);
if (!lua_istable(L, -1)) { if (!lua_istable(L, -1)) {
if (!fallback_msgid) { if (!fallback_msgid) {
@@ -490,20 +488,24 @@ tryagain:
goto tryagain; goto tryagain;
} }
} }
if (showerror) {
if (showerror) if (!fallback_msgid)
impossible("com_pager: questtext[%s][%s] in %s is not a lua table", impossible(
section, msgid, QTEXT_FILE); "com_pager: questtext[%s][%s] in %s is not a lua table",
free(fallback_msgid); section, msgid, QTEXT_FILE);
lua_close(L); else
return FALSE; impossible(
"com_pager: questtext[%s][%s] and [][%s] in %s are not lua tables",
section, msgid, fallback_msgid, QTEXT_FILE);
}
goto compagerdone;
} }
synopsis = get_table_str_opt(L, "synopsis", NULL); synopsis = get_table_str_opt(L, "synopsis", NULL);
text = get_table_str_opt(L, "text", NULL); text = get_table_str_opt(L, "text", NULL);
output = howtoput2i[get_table_option(L, "output", "default", howtoput)]; output = howtoput2i[get_table_option(L, "output", "default", howtoput)];
if (!synopsis && !text) { if (!text) {
int nelems; int nelems;
lua_len(L, -1); lua_len(L, -1);
@@ -512,11 +514,10 @@ tryagain:
if (nelems < 2) { if (nelems < 2) {
if (showerror) if (showerror)
impossible( impossible(
"com_pager: questtext[%s][%s] in %s in not an array of strings", "com_pager: questtext[%s][%s] in %s in not an array of strings",
section, msgid, QTEXT_FILE); section, fallback_msgid ? fallback_msgid : msgid,
free(fallback_msgid); QTEXT_FILE);
lua_close(L); goto compagerdone;
return FALSE;
} }
nelems = rn2(nelems) + 1; nelems = rn2(nelems) + 1;
lua_pushinteger(L, nelems); lua_pushinteger(L, nelems);
@@ -529,24 +530,33 @@ tryagain:
if (output == 0 || output == 1) if (output == 0 || output == 1)
deliver_by_pline(text); deliver_by_pline(text);
else if (output == 3)
deliver_by_window(text, NHW_MENU);
else else
deliver_by_window(text, NHW_TEXT); deliver_by_window(text, (output == 3) ? NHW_MENU : NHW_TEXT);
if (synopsis) { if (synopsis) {
char in_line[BUFSZ], out_line[BUFSZ]; char in_line[BUFSZ], out_line[BUFSZ];
#if 0 /* not yet -- brackets need to be removed from quest.lua */
Sprintf(in_line, "[%.*s]",
(int) (sizeof in_line - sizeof "[]"), synopsis);
#else
Strcpy(in_line, synopsis); Strcpy(in_line, synopsis);
#endif
convert_line(in_line, out_line); convert_line(in_line, out_line);
/* bypass message delivery but be available for ^P recall */
putmsghistory(out_line, FALSE); putmsghistory(out_line, FALSE);
free(synopsis);
} }
res = TRUE;
free(fallback_msgid); compagerdone:
free(text); if (text)
free((genericptr_t) text);
if (synopsis)
free((genericptr_t) synopsis);
if (fallback_msgid)
free((genericptr_t) fallback_msgid);
lua_close(L); lua_close(L);
return TRUE; return res;
} }
void void