Free conf_opt, conf_arg upon error in config-file parsing

tar/bsdtar.c

@@ -168,6 +168,8 @@ bsdtar_init(void)
 	bsdtar->siginfo = NULL;
 	bsdtar->substitution = NULL;
 	bsdtar->conffile = NULL;
+	bsdtar->conf_opt = NULL;
+	bsdtar->conf_arg = NULL;
 
 	/* We don't have bsdtar->progname yet, so we can't use bsdtar_errc. */
 	if (atexit(bsdtar_atexit)) {
@@ -194,6 +196,8 @@ bsdtar_atexit(void)
 	free(bsdtar->homedir);
 	free(bsdtar->option_csv_filename);
 	free(bsdtar->conffile);
+	free(bsdtar->conf_opt);
+	free(bsdtar->conf_arg);
 
 	/* Free matching and (if applicable) substitution patterns. */
 	cleanup_exclusions(bsdtar);
@@ -1287,6 +1291,9 @@ configfile_helper(struct bsdtar *bsdtar, const char *line)
 	if ((conf_opt = strdup(line)) == NULL)
 		bsdtar_errc(bsdtar, 1, errno, "Out of memory");
 
+	/* Record pointer for freeing upon error. */
+	bsdtar->conf_opt = conf_opt;
+
 	/*
 	 * Detect any trailing whitespace.  This could happen before string
 	 * duplication, but to reduce the number of diffs to a later version,
@@ -1340,6 +1347,9 @@ configfile_helper(struct bsdtar *bsdtar, const char *line)
 		conf_arg_malloced = NULL;
 	}
 
+	/* Record pointer for freeing upon error. */
+	bsdtar->conf_arg = conf_arg;
+
 	/* Process the configuration option. */
 	dooption(bsdtar, conf_opt, conf_arg, 1);
 
@@ -1349,6 +1359,10 @@ configfile_helper(struct bsdtar *bsdtar, const char *line)
 	/* Free memory allocated by strdup. */
 	free(conf_opt);
 
+	/* Memory has been freed. */
+	bsdtar->conf_arg = NULL;
+	bsdtar->conf_opt = NULL;
+
 	return (0);
 }
 

tar/bsdtar.h

@@ -130,6 +130,8 @@ struct bsdtar {
 
 	/* Config-file parsing strings. */
 	char		 *conffile;
+	char		 *conf_opt;
+	char		 *conf_arg;
 
 	/* Used for --dryrun with tarsnap.conf.sample with a missing keyfile. */
 	int		  config_file_keyfile_failed;