summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-01-27 14:40:00 +0100
committerBram Moolenaar <Bram@vim.org>2015-01-27 14:40:00 +0100
commitaaf3047de2123ae87811e947ddbaee97593fad57 (patch)
treec1318864f15d38c10aba6158ca6c668adb37a130
parent5c27fd100aa5ec587e9d6b2a4a751172b890c837 (diff)
downloadvim-git-aaf3047de2123ae87811e947ddbaee97593fad57.tar.gz
updated for version 7.4.599v7.4.599
Problem: Out-of-memory error. Solution: Avoid trying to allocate a negative amount of memory, use size_t instead of int. (Dominique Pelle)
-rw-r--r--src/regexp_nfa.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index 2bd75af20..3d125f092 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -5408,7 +5408,7 @@ nfa_regmatch(prog, start, submatch, m)
regsubs_T *m;
{
int result;
- int size = 0;
+ size_t size = 0;
int flag = 0;
int go_to_nextline = FALSE;
nfa_thread_T *t;
diff --git a/src/version.c b/src/version.c
index 35a716058..7f84aec66 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 */
/**/
+ 599,
+/**/
598,
/**/
597,