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

questpgr memory bug

Browse Source 
Pointed out by heaputil:  attempt to free null pointer.  ANSI C
allows that, so no crash, but it still indicates a mistake.
This commit is contained in:
PatR
2019-12-08 10:33:38 -08:00
parent b9f3a33ec9
commit 625bfd1efd
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/questpgr.c
+6 -3
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 questpgr.c $NHDT-Date: 1574634383 2019/11/24 22:26:23 $ $NHDT-Branch: paxed-quest-lua $:$NHDT-Revision: 1.63 $ */ /* NetHack 3.6 questpgr.c $NHDT-Date: 1575830005 2019/12/08 18:33:25 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.67 $ */
/* 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. */
@@ -489,7 +489,9 @@ const char *msgid;
nelems = (int) lua_tointeger(L, -1); nelems = (int) lua_tointeger(L, -1);
lua_pop(L, 1); lua_pop(L, 1);
if (nelems < 2) { if (nelems < 2) {
impossible("com_pager: questtext[%s][%s] in %s in not an array of strings", section, msgid, QTEXT_FILE); impossible(
"com_pager: questtext[%s][%s] in %s in not an array of strings",
section, msgid, QTEXT_FILE);
lua_close(L); lua_close(L);
return FALSE; return FALSE;
} }
@@ -511,12 +513,13 @@ const char *msgid;
if (synopsis) { if (synopsis) {
char in_line[BUFSZ], out_line[BUFSZ]; char in_line[BUFSZ], out_line[BUFSZ];
Strcpy(in_line, synopsis); Strcpy(in_line, synopsis);
convert_line(in_line, out_line); convert_line(in_line, out_line);
putmsghistory(out_line, FALSE); putmsghistory(out_line, FALSE);
free(synopsis);
} }
free(synopsis);
free(text); free(text);
lua_close(L); lua_close(L);
return TRUE; return TRUE;