Mercurial > hg > early-roguelike

diff arogue5/options.c @ 254:e940e6c00751

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add some braces to a loop in parse_opts(). A for loop had no braces around its body, which was a single if-else statement. In Advanced Rogue 5, another statement had been added, accidentally removing the if-else from the loop. This could have resulted in an out-of-bounds access to the options array. In the other games, the added braces are only for clarity.
author John "Elwin" Edwards
date Fri, 10 Feb 2017 09:02:58 -0500
parents 50b89f165a34
children d3968e9cb98d
line wrap: on
line diff
--- a/arogue5/options.c	Sat Jan 28 15:49:41 2017 -0500
+++ b/arogue5/options.c	Fri Feb 10 09:02:58 2017 -0500
@@ -377,6 +377,7 @@
 	 * Look it up and deal with it
 	 */
 	for (op = optlist; op <= &optlist[NUM_OPTS-1]; op++)
+	{
             /* None of these can be changed if using system savefiles. */
             if (use_savedir && (!strcmp(op->o_name, "name") ||
                                 !strcmp(op->o_name, "file") ||
@@ -442,6 +443,7 @@
 		*(bool *)op->o_opt = FALSE;
 		break;
 	    }
+	}
 
 	/*
 	 * skip to start of next option name