# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1456950604 -3600
# Node ID 49d0e094cb936435020b7239b7c7e5aee755ef13
# Parent  d1cc355d581a36d767d99a50d6aac66d1a21de60
commit https://github.com/vim/vim/commit/bf73b91c664488ca57e2b4a8eb9b1f36f6625bc7
Author: Bram Moolenaar <Bram@vim.org>
Date:   Wed Mar 2 21:16:59 2016 +0100

    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
--- a/src/channel.c
+++ b/src/channel.c
@@ -1516,6 +1516,9 @@ may_invoke_callback(channel_T *channel, 
 	     * 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
--- a/src/version.c
+++ b/src/version.c
@@ -744,6 +744,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1471,
+/**/
     1470,
 /**/
     1469,