From 66b9a483757ed3251b93272d126b0c39d8b28454 Mon Sep 17 00:00:00 2001
From: Thomas White <taw@physics.org>
Date: Tue, 28 Jul 2020 15:31:22 +0200
Subject: Fix a couple of memory bugs in event expansion

---
 libcrystfel/src/image-hdf5.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'libcrystfel')

diff --git a/libcrystfel/src/image-hdf5.c b/libcrystfel/src/image-hdf5.c
index 6c2a323a..fac79e99 100644
--- a/libcrystfel/src/image-hdf5.c
+++ b/libcrystfel/src/image-hdf5.c
@@ -269,7 +269,6 @@ char *substitute_path(const char *ev, const char *pattern)
 		free(plvals);
 		return NULL;
 	}
-	subs[0] = '\0';
 
 	pl_pos = strchr(pattern, '%');
 	if ( pl_pos == NULL ) {
@@ -278,6 +277,7 @@ char *substitute_path(const char *ev, const char *pattern)
 		return NULL;
 	}
 	strncpy(subs, pattern, pl_pos-pattern);
+	subs[pl_pos-pattern] = '\0';
 
 	start = pl_pos+1;
 	for ( i=0; i<n_plvals; i++ ) {
@@ -1408,7 +1408,9 @@ char **expand_paths(hid_t fh, char *pattern, int *n_evs)
 	start = pattern+1;
 	for ( i=0; i<n_sep; i++ ) {
 		char *sep = strchr(start, '/');
-		assert(sep != NULL);
+		if ( sep == NULL ) {
+			sep = start+strlen(start);
+		}
 		pattern_bits[i] = strndup(start, sep-start);
 		if ( pattern_bits[i] == NULL ) return NULL;
 		start = sep+1;
-- 
cgit v1.2.3