patch 7.4.1813

Problem:    Memory access error when running test_quickfix.
Solution:   Allocate one more byte. (Yegappan Lakshmanan)

diff --git a/src/quickfix.c b/src/quickfix.c
index 99db6d7d08b9c17c136d84f082ed08cbccc07320..6a38c789a300f8b9d645ac0d48ee8354d2cfb22d 100644 (file)
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -545,12 +545,12 @@ qf_init_ext(
                        linelen = len > LINE_MAXLEN ? LINE_MAXLEN - 1 : len;
                        if (growbuf == NULL)
                        {
-                           growbuf = alloc(linelen);
+                           growbuf = alloc(linelen + 1);
                            growbufsiz = linelen;
                        }
                        else if (linelen > growbufsiz)
                        {
-                           growbuf = vim_realloc(growbuf, linelen);
+                           growbuf = vim_realloc(growbuf, linelen + 1);
                            if (growbuf == NULL)
                                goto qf_init_end;
                            growbufsiz = linelen;
@@ -589,13 +589,13 @@ qf_init_ext(
                            linelen = LINE_MAXLEN - 1;
                        if (growbuf == NULL)
                        {
-                           growbuf = alloc(linelen);
+                           growbuf = alloc(linelen + 1);
                            growbufsiz = linelen;
                        }
                        else if (linelen > growbufsiz)
                        {
                            if ((growbuf = vim_realloc(growbuf,
-                                       linelen)) == NULL)
+                                       linelen + 1)) == NULL)
                                goto qf_init_end;
                            growbufsiz = linelen;
                        }
@@ -623,14 +623,14 @@ qf_init_ext(
                {
                    if (growbuf == NULL)
                    {
-                       growbuf = alloc(linelen);
+                       growbuf = alloc(linelen + 1);
                        growbufsiz = linelen;
                    }
                    else if (linelen > growbufsiz)
                    {
                        if (linelen > LINE_MAXLEN)
                            linelen = LINE_MAXLEN - 1;
-                       if ((growbuf = vim_realloc(growbuf, linelen)) == NULL)
+                       if ((growbuf = vim_realloc(growbuf, linelen + 1)) == NULL)
                            goto qf_init_end;
                        growbufsiz = linelen;
                    }

diff --git a/src/version.c b/src/version.c
index 75e692d5d628de2ea4ebe6fff270ee2c3a7b43b1..5a612d4fa6afb88d04180c97e79908bb1336b594 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1813,
 /**/
     1812,
 /**/