patch 8.2.2458: Coverity warns for :retab using freed memory

Problem:    Coverity warns for :retab using freed memory.
Solution:   Use the updated line pointer when moving text properties.

diff --git a/src/indent.c b/src/indent.c
index a9d406e3a0c6862f656f13d8f3860d4fd4b097aa..6ac6182df4d4233aa2ad6b896c9031a7f63f882b 100644 (file)
--- a/src/indent.c
+++ b/src/indent.c
@@ -1662,7 +1662,9 @@ ex_retab(exarg_T *eap)
                        ptr = new_line + start_col;
                        for (col = 0; col < len; col++)
                            ptr[col] = (col < num_tabs) ? '\t' : ' ';
-                       ml_replace(lnum, new_line, FALSE);
+                       if (ml_replace(lnum, new_line, FALSE) == OK)
+                           // "new_line" may have been copied
+                           new_line = curbuf->b_ml.ml_line_ptr;
                        if (first_line == 0)
                            first_line = lnum;
                        last_line = lnum;

diff --git a/src/version.c b/src/version.c
index ab00e37c79ed790fc85c5e5f2aa7a5e7afc2ee67..dd7c3b08f14820495266d634ff0249aef7a05947 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2458,
 /**/
     2457,
 /**/