From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 13 Dec 2018 22:16:36 +0000 (+0100)
Subject: patch 8.1.0581: double free without the text properties feature
X-Git-Tag: v8.1.0581
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ca79a5fc3b383dcfc8ed2077688ea69dafadc6e7;p=vim

patch 8.1.0581: double free without the text properties feature

Problem:    Double free without the text properties feature.
Solution:   Reset the dirty flag.
---

diff --git a/src/memline.c b/src/memline.c
index 59e450260..0eb31c3c5 100644
--- a/src/memline.c
+++ b/src/memline.c
@@ -3176,9 +3176,9 @@ ml_replace_len(linenr_T lnum, char_u *line_arg, colnr_T len_arg, int copy)
     {
 	// another line is buffered, flush it
 	ml_flush_line(curbuf);
+	curbuf->b_ml.ml_flags &= ~ML_LINE_DIRTY;
 
 #ifdef FEAT_TEXT_PROP
-	curbuf->b_ml.ml_flags &= ~ML_LINE_DIRTY;
 	if (has_any_text_properties(curbuf))
 	    // Need to fetch the old line to copy over any text properties.
 	    ml_get_buf(curbuf, lnum, TRUE);
diff --git a/src/version.c b/src/version.c
index 9f097afa4..9a44976f0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -799,6 +799,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    581,
 /**/
     580,
 /**/