updated for version 7.1-294

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index a87dab6a6fdffc24f039ad41575cd167a08862cb..218ced0f76659bbdc17462bdfd941f4340b0e7e6 100644 (file)
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -1160,6 +1160,7 @@ do_filter(line1, line2, eap, cmd, do_in, do_out)
     if (!do_out)
        msg_putchar('\n');
 
+    /* Create the shell command in allocated memory. */
     cmd_buf = make_filter_cmd(cmd, itmp, otmp);
     if (cmd_buf == NULL)
        goto filterend;
@@ -1180,7 +1181,10 @@ do_filter(line1, line2, eap, cmd, do_in, do_out)
     if (do_out)
     {
        if (u_save((linenr_T)(line2), (linenr_T)(line2 + 1)) == FAIL)
+       {
+           vim_free(cmd_buf);
            goto error;
+       }
        redraw_curbuf_later(VALID);
     }
     read_linecount = curbuf->b_ml.ml_line_count;
@@ -4471,7 +4475,7 @@ do_sub(eap)
            /*
             * The new text is build up step by step, to avoid too much
             * copying.  There are these pieces:
-            * sub_firstline    The old text, unmodifed.
+            * sub_firstline    The old text, unmodified.
             * copycol          Column in the old text where we started
             *                  looking for a match; from here old text still
             *                  needs to be copied to the new text.

diff --git a/src/version.c b/src/version.c
index 341d66114ffe9752e8d6caa2072a1aad3af4cb8b..a46ddaecb40f9384823adf25818b136a97268380 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    294,
 /**/
     293,
 /**/