diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-08-19 20:08:15 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-08-19 20:08:15 +0200 |
| commit | ea7ecfe2a08877f98edec9b9c26b9e1b3673f00b (patch) | |
| tree | a5efb8f8e769a84ebb5398cb7b26f1c2e5c95c80 | |
| parent | 073e4b92e613d22ce7b16e0fbf5c0e40cb5f9b2c (diff) | |
patch 8.1.1889: Coverity warns for using a NULL pointerv8.1.1889
Problem: Coverity warns for using a NULL pointer.
Solution: Use zero for column if pos is NULL.
| -rw-r--r-- | src/netbeans.c | 11 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/netbeans.c b/src/netbeans.c index 41b0c31af9..9a34460aaa 100644 --- a/src/netbeans.c +++ b/src/netbeans.c @@ -1389,17 +1389,18 @@ nb_do_cmd( && ((pos != NULL && pos->col > 0) || (lnum == 1 && buf_was_empty))) { - char_u *oldline = ml_get(lnum); - char_u *newline; + char_u *oldline = ml_get(lnum); + char_u *newline; + int col = pos == NULL ? 0 : pos->col; /* Insert halfway a line. */ newline = alloc(STRLEN(oldline) + len + 1); if (newline != NULL) { - mch_memmove(newline, oldline, (size_t)pos->col); - newline[pos->col] = NUL; + mch_memmove(newline, oldline, (size_t)col); + newline[col] = NUL; STRCAT(newline, args); - STRCAT(newline, oldline + pos->col); + STRCAT(newline, oldline + col); ml_replace(lnum, newline, FALSE); } } diff --git a/src/version.c b/src/version.c index 85d481a32a..d7bdfa2c06 100644 --- a/src/version.c +++ b/src/version.c @@ -766,6 +766,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1889, +/**/ 1888, /**/ 1887, |