summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/channel.c3
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/channel.c b/src/channel.c
index 824da8a7d1..f9cfa853fe 100644
--- 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 66a86fb630..234ff56b58 100644
--- 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,