patch 8.1.1889: Coverity warns for using a NULL pointer
Problem: Coverity warns for using a NULL pointer.
Solution: Use zero for column if pos is NULL.
diff --git a/src/netbeans.c b/src/netbeans.c
index 41b0c31..9a34460 100644
--- a/src/netbeans.c
+++ b/src/netbeans.c
@@ -1389,17 +1389,18 @@
&& ((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 85d481a..d7bdfa2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -766,6 +766,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1889,
+/**/
1888,
/**/
1887,