patch 8.0.1825: might use NULL pointer when out of memory

Problem:    Might use NULL pointer when out of memory. (Coverity)
Solution:   Handle NULL pointer better.

diff --git a/src/getchar.c b/src/getchar.c
index 5b5b3edabde0bf924099d4719af7a2d03e7e1ee9..e82155f378b66eb5e7521c12db211c2c8edaf3e1 100644 (file)
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -4523,10 +4523,12 @@ check_abbr(
 
            if (vim_strbyte(mp->m_keys, K_SPECIAL) != NULL)
            {
+               char_u *qe = vim_strsave(mp->m_keys);
+
                /* might have CSI escaped mp->m_keys */
-               q = vim_strsave(mp->m_keys);
-               if (q != NULL)
+               if (qe != NULL)
                {
+                   q = qe;
                    vim_unescape_csi(q);
                    qlen = (int)STRLEN(q);
                }

diff --git a/src/version.c b/src/version.c
index 12a8073262896191ed70c817d7dccb80076c1455..97432839d3da39e941a20b6c28afe02fea1c746a 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 */
+/**/
+    1825,
 /**/
     1824,
 /**/