patch 8.1.1950: using NULL pointer after an out-of-memory

Problem:    Using NULL pointer after an out-of-memory.
Solution:   Check for NULL pointer. (Dominique Pelle, closes #4881)

diff --git a/src/syntax.c b/src/syntax.c
index 154b7595457bb917a004ff27810c474c7442d01e..2141beeaf6b95c03a5d16c609f6f5dd749752880 100644 (file)
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -5222,7 +5222,7 @@ syn_cmd_region(
     for (item = ITEM_START; item <= ITEM_END; ++item)
        for (ppp = pat_ptrs[item]; ppp != NULL; ppp = ppp_next)
        {
-           if (!success)
+           if (!success && ppp->pp_synp != NULL)
            {
                vim_regfree(ppp->pp_synp->sp_prog);
                vim_free(ppp->pp_synp->sp_pattern);

diff --git a/src/version.c b/src/version.c
index c40600508184ca17970a21e219d21385baf2438f..156f075139baf977196869f7e4d1b7fc65874c8c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -761,6 +761,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1950,
 /**/
     1949,
 /**/