updated for version 7.4.297
Problem: Memory leak from result of get_isolated_shell_name().
Solution: Free the memory. (Dominique Pelle)
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index f52e2ab..2e5917f 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -1554,9 +1554,11 @@
#if (defined(UNIX) && !defined(ARCHIE)) || defined(OS2)
int is_fish_shell;
+ char_u *shell_name = get_isolated_shell_name();
/* Account for fish's different syntax for subshells */
- is_fish_shell = (fnamecmp(get_isolated_shell_name(), "fish") == 0);
+ is_fish_shell = (fnamecmp(shell_name, "fish") == 0);
+ vim_free(shell_name);
if (is_fish_shell)
len = (long_u)STRLEN(cmd) + 13; /* "begin; " + "; end" + NUL */
else
diff --git a/src/misc1.c b/src/misc1.c
index 88ebd8d..95d18a5 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -10874,7 +10874,7 @@
}
/*
- * Returns the isolated name of the shell:
+ * Returns the isolated name of the shell in allocated memory:
* - Skip beyond any path. E.g., "/usr/bin/csh -f" -> "csh -f".
* - Remove any argument. E.g., "csh -f" -> "csh".
* But don't allow a space in the path, so that this works:
diff --git a/src/version.c b/src/version.c
index 93d2130..40e967d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 297,
+/**/
296,
/**/
295,
