patch 7.4.1471

Problem:    Missing out-of-memory check.  And Coverity warning.
Solution:   Bail out when msg is NULL.

diff --git a/src/channel.c b/src/channel.c
index 824da8a7d192ac5ec9376aece2e2a407d0414042..f9cfa853feb479d56341153d9ec86e1dfee38b8a 100644 (file)
--- a/src/channel.c
+++ b/src/channel.c
@@ -1516,6 +1516,9 @@ may_invoke_callback(channel_T *channel, int part)
             * get everything we have. */
            msg = channel_get_all(channel, part);
 
+       if (msg == NULL)
+           return FALSE; /* out of memory (and avoids Coverity warning) */
+
        argv[1].v_type = VAR_STRING;
        argv[1].vval.v_string = msg;
     }

diff --git a/src/version.c b/src/version.c
index 66a86fb630c9eb1bc496c101663714a721feb540..234ff56b5878d0cf9b91c2367cbafd9f1a9c3f2b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1471,
 /**/
     1470,
 /**/