From e17db6aa3e80feaed546ad8ebee7a46b01b5d2e1 Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Tue, 13 Aug 2019 18:04:59 +0200
Subject: [PATCH] Avoided potential dereference of NULL. Thanks Eliska
 Svobodova.

---
 xorriso/opts_d_h.c          | 6 +++---
 xorriso/parse_exec.c        | 2 +-
 xorriso/xorriso_timestamp.h | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/xorriso/opts_d_h.c b/xorriso/opts_d_h.c
index b0e88240..4348c68a 100644
--- a/xorriso/opts_d_h.c
+++ b/xorriso/opts_d_h.c
@@ -1390,15 +1390,15 @@ ex:;
  if(deleter && !(flag&2))
    Xorriso_pacifier_callback(xorriso, "iso_rr_paths deleted",
                              xorriso->pacifier_count, 0, "", 1|2);
- else if(first_job->action == 28  && !(flag&2))
+ else if(first_job != NULL && first_job->action == 28  && !(flag&2))
    Xorriso_pacifier_callback(xorriso, "file filters processed",
                              xorriso->pacifier_count, 0, "", 1 | 2);
  else if(mem_lut!=xorriso->last_update_time && mem_lut!=0.0 && !(flag&2))
    Xorriso_pacifier_callback(xorriso, "content bytes read",
                              xorriso->pacifier_count, 0, "", 1 | 8 | 32);
- if(first_job->action == 35 && !(flag & 1))
+ if(first_job != NULL && first_job->action == 35 && !(flag & 1))
    Xorriso_report_md5_outcome(xorriso, first_job->target, 0);
- if(first_job->action == 40) {
+ if(first_job != NULL && first_job->action == 40) {
    sprintf(xorriso->result_line,"Size lower   : %lus\n",
           (unsigned long) (first_job->estim_lower_size / (off_t) 2048));
    Xorriso_result(xorriso,0);
diff --git a/xorriso/parse_exec.c b/xorriso/parse_exec.c
index 99c91020..d4e1df78 100644
--- a/xorriso/parse_exec.c
+++ b/xorriso/parse_exec.c
@@ -97,7 +97,7 @@ int Xorriso_opt_args(struct XorrisO *xorriso, char *cmd,
  else
    do_expand= (xorriso->do_iso_rr_pattern==1 && !(flag&4)) || (flag & 512);
  if(flag&256) {
-   if(*optv < argv || (*optv >= argv + argc && argc > 0))
+   if(argv == NULL || *optv < argv || (*optv >= argv + argc && argc > 0))
      Sfile_destroy_argv(optc, optv, 0);
    return(1);
  }
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index e88161db..64569e48 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2019.08.12.190808"
+#define Xorriso_timestamP "2019.08.13.160439"