The mvwm repository's master branch has been updated. The following shows the diffstat and patchsets between the merged result and HEAD.
commit 71a68616768877f5693fb53baa414f4fe21dcdbc Merge: 55d129f cedbcb6 Author: Thomas Adam <[email protected]> Date: Tue Sep 2 21:43:54 2014 +0100 Merge branch 'branch-2_6' Conflicts: mvwm/builtins.c commit cedbcb6cd9a226613f884d7fb4a22b72c151ab02 Merge: 7609bf2 3ca7363 Author: Thomas Adam <[email protected]> Date: Tue Sep 2 21:40:40 2014 +0100 Merge remote-tracking branch 'cvs/branch-2_6' into branch-2_6 commit 3ca73635637a1499e635e0081ad08f3857dcc531 Author: domivogt <domivogt> Date: Tue Sep 2 20:29:34 2014 +0000 * Fix memory leak in wait command. diff --git a/ChangeLog b/ChangeLog index a72ea07..5d5bb27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-09-02 Dominik Vogt <dominik(dot)vogt(at)gmx(dot)de> + + * fvwm/builtins.c (CMD_Wait): + fixed a memory leak + 2014-08-28 Dominik Vogt <dominik(dot)vogt(at)gmx(dot)de> * fvwm/menus.c (get_menu_options): diff --git a/fvwm/builtins.c b/fvwm/builtins.c index 20f8c4c..0ef90d2 100644 --- a/fvwm/builtins.c +++ b/fvwm/builtins.c @@ -2539,6 +2539,7 @@ void CMD_Wait(F_CMD_ARGS) { temp++; } + free(wait_string); wait_string = safestrdup(temp); for (i = strlen(wait_string) - 1; i >= 0 && isspace(wait_string[i]); i--)
