Merge pull request #137 from tls-attacker/fix-thread-safety-issue-65

Fix thread safety issue in ThreadedScanJobExecutor

Author: TrueSkrillor

src/main/java/de/rub/nds/scanner/core/execution/ThreadedScanJobExecutor.java

@@ -21,6 +21,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -56,8 +57,8 @@ public class ThreadedScanJobExecutor<
     // Used for waiting for Threads in the ThreadPoolExecutor
     private final Semaphore semaphore;
 
-    private int probeCount;
-    private int finishedProbes = 0;
+    private volatile int probeCount;
+    private final AtomicInteger finishedProbes = new AtomicInteger(0);
 
     /**
      * Creates a new ThreadedScanJobExecutor with a custom thread pool.
@@ -140,13 +141,13 @@ private void executeProbesTillNoneCanBeExecuted(ReportT report) throws Interrupt
             List<Future<ScannerProbe<ReportT, StateT>>> finishedFutures = new ArrayList<>();
             for (Future<ScannerProbe<ReportT, StateT>> result : new ArrayList<>(futureResults)) {
                 if (result.isDone()) {
-                    finishedProbes++;
+                    int currentFinishedProbes = finishedProbes.incrementAndGet();
                     ScannerProbe<ReportT, StateT> probeResult = null;
                     try {
                         probeResult = result.get();
                         LOGGER.info(
                                 "[{}/{}] {} probe executed",
-                                finishedProbes,
+                                currentFinishedProbes,
                                 probeCount,
                                 probeResult.getType().getName());
                     } catch (ExecutionException e) {