summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2007-08-27 11:05:21 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2007-08-27 11:05:21 +0000
commit635edfa7d586b89255d9d5fc64e85d88b6343f56 (patch)
treead7393dba8a1fd28d13f9458bad1cb716d56947c
parent228ec26d10ddeb2241499b3876886146b22cea27 (diff)
Don't accept zero titles.
-rw-r--r--input.c8
-rw-r--r--tmux.h4
2 files changed, 7 insertions, 5 deletions
diff --git a/input.c b/input.c
index 4ae900ac..03805fc8 100644
--- a/input.c
+++ b/input.c
@@ -1,4 +1,4 @@
-/* $Id: input.c,v 1.2 2007-08-27 08:12:23 nicm Exp $ */
+/* $Id: input.c,v 1.3 2007-08-27 11:05:21 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -438,8 +438,10 @@ input_pair_control(u_char **buf, size_t *len,
if (**buf == ';' && (ch == '0' || ch == '1')) {
log_debug("title found, length %zu bytes: %.*s",
size - 1, (int) size - 1, *buf + 1);
- input_store_one(b, CODE_TITLE, size - 1);
- buffer_write(b, *buf + 1, size - 1);
+ if (size > 1) {
+ input_store_one(b, CODE_TITLE, size - 1);
+ buffer_write(b, *buf + 1, size - 1);
+ }
}
/* Skip the title; add one for the \007. */
diff --git a/tmux.h b/tmux.h
index 7a80956c..aae8afd8 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1,4 +1,4 @@
-/* $Id: tmux.h,v 1.2 2007-07-25 23:13:18 nicm Exp $ */
+/* $Id: tmux.h,v 1.3 2007-08-27 11:05:21 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -36,7 +36,7 @@ extern char *__progname;
/* Fatal errors. */
#define fatal(msg) log_fatal("%s: %s", __func__, msg);
-#define fatalx(msg) log_fatal("%s: %s", __func__, msg);
+#define fatalx(msg) log_fatalx("%s: %s", __func__, msg);
/* Definition to shut gcc up about unused arguments. */
#define unused __attribute__ ((unused))