commit a2dde5dedaddb7fe91c061997e1314ba569c2edf
parent d1d9e1397e6d7ee182316bbbb1dd0b1b9788b36f
Author: default <nobody@localhost>
Date: Tue, 4 Feb 2025 17:26:47 +0100
Only split real strings in xs_split_n().
Diffstat:
M | xs.h | | | 15 | ++++++++++----- |
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/xs.h b/xs.h
@@ -991,16 +991,20 @@ xs_str *xs_join(const xs_list *list, const char *sep)
xs_list *xs_split_n(const char *str, const char *sep, int times)
/* splits a string into a list upto n times */
{
+ xs_list *list = xs_list_new();
+
+ if (!xs_is_string(str) || !xs_is_string(sep))
+ return list;
+
int sz = strlen(sep);
char *ss;
- xs_list *list;
-
- list = xs_list_new();
while (times > 0 && (ss = strstr(str, sep)) != NULL) {
/* create a new string with this slice and add it to the list */
xs *s = xs_str_new_sz(str, ss - str);
- list = xs_list_append(list, s);
+
+ if (xs_is_string(s))
+ list = xs_list_append(list, s);
/* skip past the separator */
str = ss + sz;
@@ -1009,7 +1013,8 @@ xs_list *xs_split_n(const char *str, const char *sep, int times)
}
/* add the rest of the string */
- list = xs_list_append(list, str);
+ if (xs_is_string(str))
+ list = xs_list_append(list, str);
return list;
}