summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/memline.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/memline.c b/src/memline.c
index 8cd9b80b2..a1c07a967 100644
--- a/src/memline.c
+++ b/src/memline.c
@@ -3834,7 +3834,8 @@ ml_add_stack(buf)
(buf->b_ml.ml_stack_size + STACK_INCR));
if (newstack == NULL)
return -1;
- mch_memmove(newstack, buf->b_ml.ml_stack,
+ if (top > 0)
+ mch_memmove(newstack, buf->b_ml.ml_stack,
(size_t)top * sizeof(infoptr_T));
vim_free(buf->b_ml.ml_stack);
buf->b_ml.ml_stack = newstack;
diff --git a/src/version.c b/src/version.c
index 6546f6a01..7298a7909 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 812,
+/**/
811,
/**/
810,