diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-10-05 21:35:16 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-10-05 21:35:16 +0200 |
| commit | 1671de3098b7ab663398dd694b314e7f67a93411 (patch) | |
| tree | 7c50130f4fc80e0c91bdb02798c459cca422456d | |
| parent | 2efc44b3f0b6bd8307cb281af095e08e15ab1c24 (diff) | |
| download | vim-git-1671de3098b7ab663398dd694b314e7f67a93411.tar.gz | |
patch 8.1.2116: no check for out of memoryv8.1.2116
Problem: No check for out of memory.
Solution: Check for NULL pointer.
| -rw-r--r-- | src/option.c | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/option.c b/src/option.c index 75ff3cdb2..60c1141b6 100644 --- a/src/option.c +++ b/src/option.c @@ -112,9 +112,12 @@ set_init_1(int clean_arg) { len = STRLEN(p) + 3; // two quotes and a trailing NUL cmd = alloc(len); - vim_snprintf((char *)cmd, len, "\"%s\"", p); - set_string_default("sh", cmd); - vim_free(cmd); + if (cmd != NULL) + { + vim_snprintf((char *)cmd, len, "\"%s\"", p); + set_string_default("sh", cmd); + vim_free(cmd); + } } else set_string_default("sh", p); diff --git a/src/version.c b/src/version.c index b1bccb4f6..11bfd6844 100644 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2116, +/**/ 2115, /**/ 2114, |