patch 8.1.0641: no check for out-of-memory when converting regexp

Problem:    No check for out-of-memory when converting regexp.
Solution:   Bail out when lalloc() returns NULL. (John Marriott)

diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index ff6215e73bc3755a665f9ca29adedeb431e88599..d779feead766aeecb3129ca78dcdf0dc839ba998 100644 (file)
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -3218,8 +3218,10 @@ post2nfa(int *postfix, int *end, int nfa_calc_size)
 
     if (nfa_calc_size == FALSE)
     {
-       /* Allocate space for the stack. Max states on the stack : nstate */
+       // Allocate space for the stack. Max states on the stack: "nstate'.
        stack = (Frag_T *)lalloc((nstate + 1) * sizeof(Frag_T), TRUE);
+       if (stack == NULL)
+           return NULL;
        stackp = stack;
        stack_end = stack + (nstate + 1);
     }

diff --git a/src/version.c b/src/version.c
index 10ba489e55eaee9515eb867219a13310ee0cd82b..3150da92f50faf1bee372d7793abf6dedfc7f9cf 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -799,6 +799,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    641,
 /**/
     640,
 /**/