diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-03-02 21:16:59 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-03-02 21:16:59 +0100 |
| commit | bf73b91c664488ca57e2b4a8eb9b1f36f6625bc7 (patch) | |
| tree | 45de018d6785a8f317131b0471954b3fbf96242c | |
| parent | 289a90551d185c307abd4cfe6baadea8990d956b (diff) | |
patch 7.4.1471v7.4.1471
Problem: Missing out-of-memory check. And Coverity warning.
Solution: Bail out when msg is NULL.
| -rw-r--r-- | src/channel.c | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
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, |