From f6a3170907e15df79019a670b42ba6d7fb55562f Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Sun, 22 May 2011 18:14:56 +0000
Subject: [PATCH] Reacted on static code checker warning reported by George
 Danchev

---
 xorriso/findjob.c           |  4 +++-
 xorriso/opts_a_c.c          |  8 ++++----
 xorriso/opts_i_o.c          | 11 ++++++-----
 xorriso/xorriso_timestamp.h |  2 +-
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/xorriso/findjob.c b/xorriso/findjob.c
index be68814c..68aaf4c7 100644
--- a/xorriso/findjob.c
+++ b/xorriso/findjob.c
@@ -791,8 +791,10 @@ int Findjob_set_name_expr(struct FindjoB *o, char *name_expr, int flag)
    {ret= -1; goto ex;};
  }
  Xorriso__bourne_to_reg(name_expr, regexpr, 0);
- if(regcomp(name_re, regexpr, 0) != 0)
+ if(regcomp(name_re, regexpr, 0) != 0) {
+   free((char *) name_re);
    {ret= 0; goto ex;};
+ }
  t->arg2= name_re;
  ret= 1;
 ex:;
diff --git a/xorriso/opts_a_c.c b/xorriso/opts_a_c.c
index b7e94e84..45a84e43 100644
--- a/xorriso/opts_a_c.c
+++ b/xorriso/opts_a_c.c
@@ -102,15 +102,15 @@ int Xorriso_option_add(struct XorrisO *xorriso, int argc, char **argv,
  char *target= NULL, *source= NULL, *ept, *eff_path= NULL;
  char **optv= NULL, *rpt, *wpt;
 
- Xorriso_alloc_meM(target, char, SfileadrL);
- Xorriso_alloc_meM(source, char, SfileadrL);
- Xorriso_alloc_meM(eff_path, char, SfileadrL);
-
  ret= Xorriso_opt_args(xorriso, "-add", argc, argv, *idx, &end_idx,
                        &optc, &optv, ((!!xorriso->allow_graft_points)<<2)|2);
  if(ret<=0)
    goto ex;
 
+ Xorriso_alloc_meM(target, char, SfileadrL);
+ Xorriso_alloc_meM(source, char, SfileadrL);
+ Xorriso_alloc_meM(eff_path, char, SfileadrL);
+
  if(!(flag&2))
    Xorriso_pacifier_reset(xorriso, 0);
  for(i= 0; i<optc; i++) {
diff --git a/xorriso/opts_i_o.c b/xorriso/opts_i_o.c
index efb5c1a1..5e1df4f3 100644
--- a/xorriso/opts_i_o.c
+++ b/xorriso/opts_i_o.c
@@ -469,11 +469,6 @@ int Xorriso_option_map_l(struct XorrisO *xorriso, int argc, char **argv,
  t_wd= xorriso->wdi;
  Xorriso_pacifier_reset(xorriso, 0);
  mode= (flag>>8) & 15;
- Xorriso_alloc_meM(source_prefix, char, SfileadrL);
- Xorriso_alloc_meM(target_prefix, char, SfileadrL);
- Xorriso_alloc_meM(eff_source, char, SfileadrL);
- Xorriso_alloc_meM(eff_target, char, SfileadrL);
-
 
  if(mode==1)
    cmd= "-compare_l";
@@ -495,6 +490,12 @@ int Xorriso_option_map_l(struct XorrisO *xorriso, int argc, char **argv,
    Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 1);
    ret= 0; goto ex;
  }
+
+ Xorriso_alloc_meM(source_prefix, char, SfileadrL);
+ Xorriso_alloc_meM(target_prefix, char, SfileadrL);
+ Xorriso_alloc_meM(eff_source, char, SfileadrL);
+ Xorriso_alloc_meM(eff_target, char, SfileadrL);
+
  ret= Xorriso_normalize_img_path(xorriso, s_wd, argv[*idx],
                                  source_prefix, ns_flag | 64);
  if(ret<=0)
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index b4a9f5db..173d9b3a 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2011.05.22.143652"
+#define Xorriso_timestamP "2011.05.22.181525"