1 files changed, 4 insertions, 2 deletions
diff --git a/m_option.c b/m_option.c
index 34b7cd7a99..a7321cb629 100644
--- a/m_option.c
+++ b/m_option.c
@@ -717,11 +717,13 @@ static int parse_str_list(const m_option_t *opt, struct bstr name,
     char *ptr = str.start;
     n = 0;
 
-    while (str.len) {
+    while (1) {
         struct bstr el = get_nextsep(&str, separator, 1);
         res[n] = bstrdup0(NULL, el);
-        str = bstr_cut(str, 1);
         n++;
+        if (!str.len)
+            break;
+        str = bstr_cut(str, 1);
     }
     res[n] = NULL;
     talloc_free(ptr);