From 9b75d21e2abcb641f18c9f26e654699a537a8abc Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Mon, 5 Dec 2016 12:25:32 +0100
Subject: [PATCH] Bug fix: Mix of absolute and relative disk paths could cause
 SIGSEGV with pattern expansion

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

diff --git a/xorriso/match.c b/xorriso/match.c
index b734c6d6..91de1947 100644
--- a/xorriso/match.c
+++ b/xorriso/match.c
@@ -649,7 +649,7 @@ int Xorriso_expand_disk_pattern(struct XorrisO *xorriso,
  xorriso->structured_search= 1;
 
  for(i= 0; i<num_patterns; i++) {
-
+   abs_adr= 0;
    ret= Xorriso_prepare_expansion_pattern(xorriso, patterns[i], 4);
    if(ret<=0)
      goto ex;
@@ -705,10 +705,12 @@ int Xorriso_expand_disk_pattern(struct XorrisO *xorriso,
 
  /* now store addresses */
  for(i= 0; i<num_patterns; i++) {
-
+   abs_adr= 0;
    ret= Xorriso_prepare_expansion_pattern(xorriso, patterns[i], 4);
    if(ret<=0)
      goto ex;
+   if(ret == 2)
+     abs_adr= 4;
 
    if(patterns[i][0]=='/' || abs_adr) {
      strcpy(dir_adr, "/");
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index 3f6a0ccd..f908237f 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2016.11.19.172243"
+#define Xorriso_timestamP "2016.12.05.101546"