The branch, master has been updated
       via  77a217468507bc598e833bf15b4a1eaf7bbaf284 (commit)
      from  3e270af17a1918df1d3c3f40fc5bab336bc93c1b (commit)

- Log -----------------------------------------------------------------
commit 77a217468507bc598e833bf15b4a1eaf7bbaf284
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Commit: Nicholas Marriott <nicholas.marri...@gmail.com>

    Fix a couple of memory leaks, from Romain Francoise.
---
 cfg.c      |    4 +++-
 mode-key.c |    1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/cfg.c b/cfg.c
index 5e3e47e..c62f60c 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 7dea26d..86367ad 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 },


-----------------------------------------------------------------------

Summary of changes:
 cfg.c      |    4 +++-
 mode-key.c |    1 -
 2 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
tmux

------------------------------------------------------------------------------
The Go Parallel Website, sponsored by Intel - in partnership with Geeknet, 
is your hub for all things parallel software development, from weekly thought 
leadership blogs to news, videos, case studies, tutorials, tech docs, 
whitepapers, evaluation guides, and opinion stories. Check out the most 
recent posts - join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________
tmux-cvs mailing list
tmux-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-cvs

Reply via email to