bsock: stop timer before return from function

Fixes #1123: Director can crash during TwoWay Authentication
bareos · Oct 25, 2019 · 5f718e1 · 5f718e1
1 parent c4c8d47
commit 5f718e1
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/core/src/lib/bsock.cc b/core/src/lib/bsock.cc
@@ -396,7 +396,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) {