Ensure we never benchmark less than two salts for "Many salts". (#3922)

Closes #3912.
openwall · May 11, 2019 · 9966247 · 9966247
1 parent 26f4688
commit 9966247
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/bench.c b/src/bench.c
@@ -599,9 +599,9 @@ char *benchmark_format(struct fmt_main *format, int salts,
 		sig_timer_emu_tick();
 #endif
 		salts_done++;
-	} while (benchmark_time &&
-		 (((wait && salts_done < salts) ||
-	          bench_running) && !event_abort));
+	} while (benchmark_time && (bench_running ||
+		(salts_done < (wait ? salts : MIN(salts, 2)))) &&
+	         !event_abort);
 
 #if defined (__MINGW32__) || defined (_MSC_VER)
 	end_real = clock();