Browse Source

Merge commit '1d5d28d' into cg_merges_20131023a

Luke Dashjr 12 years ago
parent
commit
668f3e01c0
1 changed files with 3 additions and 0 deletions
  1. 3 0
      miner.c

+ 3 - 0
miner.c

@@ -1926,6 +1926,9 @@ static char *parse_config(json_t *config, bool fileconf)
 		/* We don't handle subtables. */
 		assert(!(opt->type & OPT_SUBTABLE));
 
+		if (!opt->names)
+			continue;
+
 		/* Pull apart the option name(s). */
 		name = strdup(opt->names);
 		for (p = strtok_r(name, "|", &sp); p; p = strtok_r(NULL, "|", &sp)) {