parse_conf_file fix fix

PatR · PatR · commit f001de79542b · 2019-12-17T15:41:58.000-08:00
diff --git a/src/files.c b/src/files.c
@@ -1,4 +1,4 @@
-/* NetHack 3.6	files.c	$NHDT-Date: 1574116097 2019/11/18 22:28:17 $  $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.272 $ */
+/* NetHack 3.6	files.c	$NHDT-Date: 1576626110 2019/12/17 23:41:50 $  $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.276 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Derek S. Ray, 2015. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -3160,7 +3160,8 @@ boolean FDECL((*proc), (char *));
                         free(buf);
                     }
                     buf = strcat(tmpbuf, ep);
-                    buf[sizeof inbuf - 1] = '\0';
+                    if (strlen(buf) >= sizeof inbuf)
+                        buf[sizeof inbuf - 1] = '\0';
                 }
 
                 if (morelines || (ignoreline && !oldline))

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* NetHack 3.6 files.c $NHDT-Date: 1574116097 2019/11/18 22:28:17 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.272 $ */`
	`1`	`+/* NetHack 3.6 files.c $NHDT-Date: 1576626110 2019/12/17 23:41:50 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.276 $ */`
`2`	`2`	`/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */`
`3`	`3`	`/-Copyright (c) Derek S. Ray, 2015. /`
`4`	`4`	`/* NetHack may be freely redistributed. See license for details. */`
`@@ -3160,7 +3160,8 @@ boolean FDECL((proc), (char ));`
`3160`	`3160`	`free(buf);`
`3161`	`3161`	`}`
`3162`	`3162`	`buf = strcat(tmpbuf, ep);`
`3163`		`- buf[sizeof inbuf - 1] = '\0';`
	`3163`	`+ if (strlen(buf) >= sizeof inbuf)`
	`3164`	`+ buf[sizeof inbuf - 1] = '\0';`
`3164`	`3165`	`}`
`3165`	`3166`
`3166`	`3167`	`if (morelines \|\| (ignoreline && !oldline))`