diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-05-12 21:34:58 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-05-12 21:34:58 +0200 |
| commit | dd1d7be4e6691f447667a8217844a3b2561203be (patch) | |
| tree | 95aa4c83da0b9766808a137dc01d651f3eabfb73 | |
| parent | 73dd1bd54e3d358f156f45e956f6e56527238ac6 (diff) | |
patch 8.0.1825: might use NULL pointer when out of memoryv8.0.1825
Problem: Might use NULL pointer when out of memory. (Coverity)
Solution: Handle NULL pointer better.
| -rw-r--r-- | src/getchar.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/getchar.c b/src/getchar.c index 5b5b3edabd..e82155f378 100644 --- a/src/getchar.c +++ b/src/getchar.c @@ -4523,10 +4523,12 @@ check_abbr( if (vim_strbyte(mp->m_keys, K_SPECIAL) != NULL) { + char_u *qe = vim_strsave(mp->m_keys); + /* might have CSI escaped mp->m_keys */ - q = vim_strsave(mp->m_keys); - if (q != NULL) + if (qe != NULL) { + q = qe; vim_unescape_csi(q); qlen = (int)STRLEN(q); } diff --git a/src/version.c b/src/version.c index 12a8073262..97432839d3 100644 --- a/src/version.c +++ b/src/version.c @@ -762,6 +762,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1825, +/**/ 1824, /**/ 1823, |