From 2b5bf78fafdf027624ca88e1f703bc9e577f4690 Mon Sep 17 00:00:00 2001 From: Matt Coffin Date: Tue, 11 Jun 2019 12:10:17 -0600 Subject: Fix segfaults caused by faulty command parsing This patch fixes faulty command parsing introduced by f0f5de9a9e87ca1f0d74e7cbf82ffceba51ffbe6. When that commit allowed criteria reset on ';' delimeters in commands lists, it failed to account for its inner ','-parsing loop eating threw the entire rest of the string. This patch refactors argsep to use a list of multiple separators, and (optionally) return the separator that it matched against in this iteration via a pointer. This allows it to hint at the command parser which separator was used at the end of the last command, allowing it to trigger a potential secondary read of the criteria. Fixes #4239 --- include/stringop.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/stringop.h') diff --git a/include/stringop.h b/include/stringop.h index 6f920999..2aabcee7 100644 --- a/include/stringop.h +++ b/include/stringop.h @@ -24,6 +24,6 @@ int unescape_string(char *string); char *join_args(char **argv, int argc); // Split string into 2 by delim, handle quotes -char *argsep(char **stringp, const char *delim); +char *argsep(char **stringp, const char *delim, char *matched_delim); #endif -- cgit v1.2.3-54-g00ecf