From 8828d6f465c82d06e92ba1f5f0ed9d675c52a81c Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Sun, 1 Sep 2019 09:25:03 +0200 Subject: [PATCH] Bug fix: -disk_pattern on -add "" -- yielded SIGSEGV --- xorriso/parse_exec.c | 3 ++- xorriso/xorriso_timestamp.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xorriso/parse_exec.c b/xorriso/parse_exec.c index d4e1df78..26d9bd9a 100644 --- a/xorriso/parse_exec.c +++ b/xorriso/parse_exec.c @@ -121,6 +121,7 @@ int Xorriso_opt_args(struct XorrisO *xorriso, char *cmd, *optc= *end_idx - idx; *optv= NULL; if(*optc<=0 || !do_expand) { +copy_args:; if(*optc > 0) { Xorriso_alloc_meM(*optv, char *, *optc); for(i= 0; i < *optc; i++) { @@ -153,7 +154,7 @@ no_memory:; } if(nump<=0) { /* Only empty texts. May the caller get happy with them. */ free(patterns); - return(1); + goto copy_args; } if(flag&2) ret= Xorriso_expand_disk_pattern(xorriso, nump, patterns, was_empty, diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index b0e3e7bc..896b69bc 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2019.09.01.071948" +#define Xorriso_timestamP "2019.09.01.072438"