aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-07-27 14:42:02 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-07-27 14:42:02 +0000
commit3b2492029e934eb817a4f8666b294eb827a67781 (patch)
treeecc95afe1cc9e24bb304c2d0284e18185739d427
parentdoc: benchmark: update 'laptop' results after foot-1.4.0 (diff)
parentchangelog: mention fix for crash on unclosed quote in tokenizer (diff)
Merge branch 'tokenizer-reset-argv-on-error'
Closes #49.
-rw-r--r--CHANGELOG.md3
-rw-r--r--tokenize.c3
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index df304262..d4836891 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,6 +42,9 @@
### Fixed
* Crash in scrollback search
+* Crash when a **pipe-visible** or **pipe-scrollback** command
+ contained an unclosed quote
+ (https://codeberg.org/dnkl/foot/issues/49).
### Security
diff --git a/tokenize.c b/tokenize.c
index b4aab6b5..2671e23b 100644
--- a/tokenize.c
+++ b/tokenize.c
@@ -44,8 +44,9 @@ tokenize_cmdline(char *cmdline, char ***argv)
char *end = strchr(p, delim);
if (end == NULL) {
if (delim != ' ') {
- LOG_ERR("unterminated %s quote\n", delim == '"' ? "double" : "single");
+ LOG_ERR("unterminated %s quote", delim == '"' ? "double" : "single");
free(*argv);
+ *argv = NULL;
return false;
}