diff options
author | S. Christoffer Eliesen <christoffer@eliesen.no> | 2015-10-19 19:42:49 +0200 |
---|---|---|
committer | S. Christoffer Eliesen <christoffer@eliesen.no> | 2015-10-19 19:45:35 +0200 |
commit | e3837ba634dd51482bb89cfa2b2f13f01bfcbcb6 (patch) | |
tree | 223b4bf653a5a77b3940c28b541048c6029f4886 /sway/commands.c | |
parent | Merge pull request #195 from sce/get_socketpath (diff) | |
download | sway-e3837ba634dd51482bb89cfa2b2f13f01bfcbcb6.tar.gz sway-e3837ba634dd51482bb89cfa2b2f13f01bfcbcb6.tar.zst sway-e3837ba634dd51482bb89cfa2b2f13f01bfcbcb6.zip |
commands: Gracefully handle empty commands.
Before this patch sway would proceed into find_handler which would cause
a crash trying to parse a NULL string.
This could be triggered via e.g. `i3-msg -s $(sway --get-socketpath)`.
Diffstat (limited to 'sway/commands.c')
-rw-r--r-- | sway/commands.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sway/commands.c b/sway/commands.c index 5afddc4a..eb77c172 100644 --- a/sway/commands.c +++ b/sway/commands.c | |||
@@ -1178,6 +1178,11 @@ enum cmd_status handle_command(char *_exec) { | |||
1178 | // Split commands | 1178 | // Split commands |
1179 | cmd = argsep(&cmdlist, ","); | 1179 | cmd = argsep(&cmdlist, ","); |
1180 | cmd += strspn(cmd, whitespace); | 1180 | cmd += strspn(cmd, whitespace); |
1181 | if (strcmp(cmd, "") == 0) { | ||
1182 | sway_log(L_INFO, "Ignoring empty command."); | ||
1183 | continue; | ||
1184 | } | ||
1185 | |||
1181 | sway_log(L_INFO, "Handling command '%s'", cmd); | 1186 | sway_log(L_INFO, "Handling command '%s'", cmd); |
1182 | //TODO better handling of argv | 1187 | //TODO better handling of argv |
1183 | int argc; | 1188 | int argc; |