changeset 16680:c263acbbd961 v8.1.1342

patch 8.1.1342: using freed memory when joining line with text property commit https://github.com/vim/vim/commit/787880a86dbcb79cdf6e8241b1d99ac4a7acbc09 Author: Bram Moolenaar <Bram@vim.org> Date: Fri May 17 20:17:40 2019 +0200 patch 8.1.1342: using freed memory when joining line with text property Problem: Using freed memory when joining line with text property. Solution: Use already computed length.
author Bram Moolenaar <Bram@vim.org>
date Fri, 17 May 2019 20:30:06 +0200
parents 86d8068ffeda
children 12218ecea336
files src/ops.c src/version.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/ops.c
+++ b/src/ops.c
@@ -4635,7 +4635,7 @@ do_join(
     {
 	/* Set the '] mark. */
 	curwin->w_buffer->b_op_end.lnum = curwin->w_cursor.lnum;
-	curwin->w_buffer->b_op_end.col  = (colnr_T)STRLEN(newp);
+	curwin->w_buffer->b_op_end.col  = (colnr_T)sumsize;
     }
 
     /* Only report the change in the first line here, del_lines() will report
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1342,
+/**/
     1341,
 /**/
     1340,