bsock: stop timer before return from function

Fixes #1123: Director can crash during TwoWay Authentication
bareos · Oct 25, 2019 · 5a92516 · 5a92516
1 parent 975d673
commit 5a92516
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/core/src/lib/bsock.cc b/core/src/lib/bsock.cc
@@ -384,7 +384,10 @@ bool BareosSocket::TwoWayAuthenticate(JobControlRecord *jcr,
 
     btimer_t *tid = StartBsockTimer(this, AUTH_TIMEOUT);
 
-    if (ConnectionReceivedTerminateSignal()) { return false; }
+    if (ConnectionReceivedTerminateSignal()) {
+      if (tid) { StopBsockTimer(tid); }
+      return false;
+    }
 
     auth_success = cram_md5_handshake.DoHandshake(initiated_by_remote);
     if (!auth_success) {