tls: fix nullpointer reference if jcr is nullpointer

For the suppression of double error messages we now verify that jcr is not null before dereferencing it.
bareos · Oct 1, 2018 · eed9ddc · eed9ddc
1 parent 0539be3
commit eed9ddc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/core/src/dird/fd_cmds.cc b/core/src/dird/fd_cmds.cc
@@ -182,7 +182,7 @@ static void OutputMessageForConnectionTry(JobControlRecord *jcr, UaContext *ua)
          break;
    }
 
-   if (jcr->JobId != 0) {
+   if (jcr && jcr->JobId != 0) {
       Jmsg(jcr, M_INFO, 0, m.c_str());
    }
    if (ua) {
@@ -204,7 +204,7 @@ static void SendInfoChosenCipher(JobControlRecord *jcr, UaContext *ua)
 
 static void SendInfoFailed(JobControlRecord *jcr, UaContext *ua)
 {
-   if (jcr->JobId != 0) {
+   if (jcr && jcr->JobId != 0) {
      Jmsg(jcr, M_INFO, 0, "Failed");
    }
    if (ua) { /* only whith console connection */

diff --git a/core/src/lib/bsock.cc b/core/src/lib/bsock.cc
@@ -573,7 +573,7 @@ bool BareosSocket::DoTlsHandshakeWithClient(TlsConfigBase *selected_local_tls, J
   if (BnetTlsServer(this, verify_list)) {
     return true;
   }
-  if (jcr->JobId != 0) {
+  if (jcr && jcr->JobId != 0) {
     Jmsg(jcr, M_FATAL, 0, _("TLS negotiation failed.\n"));
   }
   Dmsg0(debuglevel, "TLS negotiation failed.\n");
@@ -589,7 +589,7 @@ bool BareosSocket::DoTlsHandshakeWithServer(TlsConfigBase *selected_local_tls,
                     selected_local_tls->AllowedCertificateCommonNames())) {
     return true;
   }
-  if (jcr->JobId != 0) {
+  if (jcr && jcr->JobId != 0) {
     Jmsg(jcr, M_FATAL, 0, _("TLS negotiation failed.\n"));
   }
   Dmsg0(debuglevel, "TLS negotiation failed.\n");