aboutsummaryrefslogtreecommitdiffstats
path: root/include/stringop.h
diff options
context:
space:
mode:
authorLibravatar Matt Coffin <mcoffin13@gmail.com>2019-06-11 12:10:17 -0600
committerLibravatar Brian Ashworth <bosrsf04@gmail.com>2019-06-11 14:40:36 -0400
commit2b5bf78fafdf027624ca88e1f703bc9e577f4690 (patch)
treeee24a2a3740563aecfab9fdc922eafebf1527c97 /include/stringop.h
parentAdd docs for new IPC keyboard properties (diff)
downloadsway-2b5bf78fafdf027624ca88e1f703bc9e577f4690.tar.gz
sway-2b5bf78fafdf027624ca88e1f703bc9e577f4690.tar.zst
sway-2b5bf78fafdf027624ca88e1f703bc9e577f4690.zip
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
Diffstat (limited to 'include/stringop.h')
-rw-r--r--include/stringop.h2
1 files changed, 1 insertions, 1 deletions
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);
24char *join_args(char **argv, int argc); 24char *join_args(char **argv, int argc);
25 25
26// Split string into 2 by delim, handle quotes 26// Split string into 2 by delim, handle quotes
27char *argsep(char **stringp, const char *delim); 27char *argsep(char **stringp, const char *delim, char *matched_delim);
28 28
29#endif 29#endif