patch 7.4.2357

Problem:    Attempt to read history entry while not initialized.
Solution:   Skip when the index is negative.

diff --git a/src/ex_getln.c b/src/ex_getln.c
index 4ff9ae17a2c50e1a349cfba80f370f8ad18f877e..25a12bed3d006c4eef72cf3d5499c904502b9952 100644 (file)
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -5762,7 +5762,7 @@ add_to_history(
      */
     if (histype == HIST_SEARCH && in_map)
     {
-       if (maptick == last_maptick)
+       if (maptick == last_maptick && hisidx[HIST_SEARCH] >= 0)
        {
            /* Current line is from the same mapping, remove it */
            hisptr = &history[HIST_SEARCH][hisidx[HIST_SEARCH]];

diff --git a/src/version.c b/src/version.c
index baba587cb13447076930720049cf3a6cee3ffb06..de3d5fc970ad78ad5b5ae6370d75c40938967b9f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2357,
 /**/
     2356,
 /**/