Merge pull request #162 from bareos/dev/arogge/bareos-17.2/TT4200443

stored: fix corner-case crash during job cancel
bareos · Mar 27, 2019 · c809330 · c809330
2 parents 8a9008d + e32e005
commit c809330
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/dird/sd_cmds.c b/src/dird/sd_cmds.c
@@ -668,8 +668,10 @@ bool cancel_storage_daemon_job(UAContext *ua, JCR *jcr, bool interactive)
    if (!interactive) {
       jcr->sd_canceled = true;
    }
-   jcr->store_bsock->set_timed_out();
-   jcr->store_bsock->set_terminated();
+   if (jcr->store_bsock) {
+     jcr->store_bsock->set_timed_out();
+     jcr->store_bsock->set_terminated();
+   }
    sd_msg_thread_send_signal(jcr, TIMEOUT_SIGNAL);
 
    /*