From 71f0345725010ad2b17f9bbbf4d3db66d20e19f6 Mon Sep 17 00:00:00 2001
From: Thomas White <taw@physics.org>
Date: Fri, 17 Feb 2023 13:56:43 +0100
Subject: strip_extension: Handle short strings better

---
 libcrystfel/src/utils.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'libcrystfel')

diff --git a/libcrystfel/src/utils.c b/libcrystfel/src/utils.c
index 572db023..b69a816d 100644
--- a/libcrystfel/src/utils.c
+++ b/libcrystfel/src/utils.c
@@ -635,8 +635,12 @@ char *safe_basename(const char *in)
 
 void strip_extension(char *bfn)
 {
-	size_t r = strlen(bfn)-1;
-	while ( r > 0 ) {
+	size_t r = strlen(bfn);
+
+	if ( r < 3 ) return;
+
+	r -= 1;
+	while ( r > 1 ) {   /* Don't strip down to nothing */
 		if ( bfn[r] == '.') {
 			bfn[r] = '\0';
 			return;
-- 
cgit v1.2.3