From 7c77b3496710f1be3232cfdc7f6812347fbd914a Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 22 Dec 2019 19:40:40 +0100 Subject: patch 8.2.0033: crash when make_extmatch() runs out of memory Problem: Crash when make_extmatch() runs out of memory. Solution: Check for NULL. (Dominique Pelle, closs #5392) --- src/regexp_bt.c | 2 ++ src/regexp_nfa.c | 2 ++ src/version.c | 2 ++ 3 files changed, 6 insertions(+) diff --git a/src/regexp_bt.c b/src/regexp_bt.c index b71b86205..78be2b5f8 100644 --- a/src/regexp_bt.c +++ b/src/regexp_bt.c @@ -4568,6 +4568,8 @@ regtry( cleanup_zsubexpr(); re_extmatch_out = make_extmatch(); + if (re_extmatch_out == NULL) + return 0; for (i = 0; i < NSUBEXP; i++) { if (REG_MULTI) diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c index fb512f961..a288ea47c 100644 --- a/src/regexp_nfa.c +++ b/src/regexp_nfa.c @@ -7070,6 +7070,8 @@ nfa_regtry( { cleanup_zsubexpr(); re_extmatch_out = make_extmatch(); + if (re_extmatch_out == NULL) + return 0; // Loop over \z1, \z2, etc. There is no \z0. for (i = 1; i < subs.synt.in_use; i++) { diff --git a/src/version.c b/src/version.c index 88ea9247d..3c2c49bd6 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 */ +/**/ + 33, /**/ 32, /**/ -- cgit v1.2.1