aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2013-02-16 19:35:49 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2013-02-16 19:35:49 +0000
commit77a217468507bc598e833bf15b4a1eaf7bbaf284 (patch)
tree427b0da4bb737fa2b3a3e97504edd01c570c4198
parent3e270af17a1918df1d3c3f40fc5bab336bc93c1b (diff)
downloadrtmux-77a217468507bc598e833bf15b4a1eaf7bbaf284.tar.gz
rtmux-77a217468507bc598e833bf15b4a1eaf7bbaf284.tar.bz2
rtmux-77a217468507bc598e833bf15b4a1eaf7bbaf284.zip
Fix a couple of memory leaks, from Romain Francoise.
-rw-r--r--cfg.c4
-rw-r--r--mode-key.c1
2 files changed, 3 insertions, 2 deletions
diff --git a/cfg.c b/cfg.c
index 5e3e47e9..c62f60cc 100644
--- a/cfg.c
+++ b/cfg.c
@@ -131,8 +131,10 @@ load_cfg(const char *path, struct cmd_ctx *ctxin, struct causelist *causes)
buf = copy;
while (isspace((u_char)*buf))
buf++;
- if (*buf == '\0')
+ if (*buf == '\0') {
+ free(copy);
continue;
+ }
if (cmd_string_parse(buf, &cmdlist, &cause) != 0) {
free(copy);
diff --git a/mode-key.c b/mode-key.c
index 7dea26d8..86367ada 100644
--- a/mode-key.c
+++ b/mode-key.c
@@ -413,7 +413,6 @@ const struct mode_key_entry mode_key_emacs_copy[] = {
{ '\026' /* C-v */, 0, MODEKEYCOPY_NEXTPAGE },
{ '\027' /* C-w */, 0, MODEKEYCOPY_COPYSELECTION },
{ '\033' /* Escape */, 0, MODEKEYCOPY_CANCEL },
- { 'N', 0, MODEKEYCOPY_SEARCHREVERSE },
{ 'b' | KEYC_ESCAPE, 0, MODEKEYCOPY_PREVIOUSWORD },
{ 'f', 0, MODEKEYCOPY_JUMP },
{ 'f' | KEYC_ESCAPE, 0, MODEKEYCOPY_NEXTWORDEND },