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

fix github issue #832 - "nethack --nethackrc=file"

Browse Source 
Issue reported by schauveau:  when the command line specifies the
'--nethackrc=file' option (Unix, including linux and OSX, only) the
value of 'file' was set in pointer g.cmdline_rcfile and the options
parsing made a copy of that pointer rather than of what it pointed
to, then freed g.cmdline_rcfile before using the copy.  So it ended
up using a pointer to freed memory.

Stick with copying the pointer but defer freeing the original until
after its copy is no longer needed.

Fixes #832
This commit is contained in:
PatR
2022-08-02 15:07:20 -07:00
parent f4d0e99fad
commit c7a467701f
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/options.c
View File

@@ -6233,7 +6233,6 @@ initoptions_finish(void)
if (g.cmdline_rcfile) {
namesrc = "command line";
nameval = g.cmdline_rcfile;
free((genericptr_t) g.cmdline_rcfile), g.cmdline_rcfile = 0;
xtraopts = opts;
if (opts && (*opts == '/' || *opts == '\\' || *opts == '@'))
xtraopts = 0; /* NETHACKOPTIONS is a file name; ignore it */
@@ -6274,6 +6273,9 @@ initoptions_finish(void)
(void) parseoptions(xtraopts, TRUE, FALSE);
config_error_done();
}
if (g.cmdline_rcfile)
free((genericptr_t) g.cmdline_rcfile), g.cmdline_rcfile = 0;
/*[end of nethackrc handling]*/
(void) fruitadd(g.pl_fruit, (struct fruit *) 0);