# HG changeset patch
# User David A. Holland
# Date 1373391523 14400
# Node ID 59680a727e9da1343a11f7dfca2c79d800fb3dbf
# Parent  eaae8014a94aede976c0bb34645de6f2c7bb9e0e
Improve previous.

Just in case we ever crash and reach cleanup() while processing an
-include foo option, take the array entry for it out of the array to
make sure it doesn't get freed twice. This case shouldn't be
reachable, but it's better to be safe.

diff -r eaae8014a94a -r 59680a727e9d main.c
--- a/main.c	Tue Jul 09 13:35:40 2013 -0400
+++ b/main.c	Tue Jul 09 13:38:43 2013 -0400
@@ -268,7 +268,9 @@
 	num = array_num(&commandline_files);
 	for (i=0; i<num; i++) {
 		cf = array_get(&commandline_files, i);
-		dofree(cf, sizeof(*cf));
+		if (cf != NULL) {
+			dofree(cf, sizeof(*cf));
+		}
 	}
 	array_setsize(&commandline_files, 0);
 
@@ -313,6 +315,7 @@
 	num = array_num(&commandline_files);
 	for (i=0; i<num; i++) {
 		cf = array_get(&commandline_files, i);
+		array_set(&commandline_files, i, NULL);
 		if (cf->suppress_output) {
 			save = mode.do_output;
 			mode.do_output = false;