summaryrefslogtreecommitdiffstats
path: root/common/stringop.c
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2019-02-05 22:09:59 +0100
committerLibravatar GitHub <noreply@github.com>2019-02-05 22:09:59 +0100
commita3c531485631698109073d338da956ccaaf0a7e0 (patch)
tree1f073eead802b2db385f1986373dcabd1171a00e /common/stringop.c
parentMerge pull request #3582 from c-edw/FixUninitializedInputManager (diff)
parentoutput_cmd_background: fix no file + valid mode (diff)
downloadsway-a3c531485631698109073d338da956ccaaf0a7e0.tar.gz
sway-a3c531485631698109073d338da956ccaaf0a7e0.tar.zst
sway-a3c531485631698109073d338da956ccaaf0a7e0.zip
Merge pull request #3587 from RedSoxFan/fix-background-missing-file
output_cmd_background: fix no file + valid mode
Diffstat (limited to 'common/stringop.c')
-rw-r--r--common/stringop.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/common/stringop.c b/common/stringop.c
index 8af0d60f..709be684 100644
--- a/common/stringop.c
+++ b/common/stringop.c
@@ -258,6 +258,9 @@ int unescape_string(char *string) {
258} 258}
259 259
260char *join_args(char **argv, int argc) { 260char *join_args(char **argv, int argc) {
261 if (!sway_assert(argc > 0, "argc should be positive")) {
262 return NULL;
263 }
261 int len = 0, i; 264 int len = 0, i;
262 for (i = 0; i < argc; ++i) { 265 for (i = 0; i < argc; ++i) {
263 len += strlen(argv[i]) + 1; 266 len += strlen(argv[i]) + 1;