patch 8.1.1344: Coverity complains about possibly using a NULL pointer

Problem:    Coverity complains about possibly using a NULL pointer and copying
            a string into a fixed size buffer.
Solution:   Check for NULL, even though it should not happen.  Use
            vim_strncpy() instead of strcpy().

diff --git a/src/change.c b/src/change.c
index f1c3cc4d02fe899d10e6dc36135bde32029ceefa..33db0c1b806c7cb2c87da861fd269d379bc37b92 100644 (file)
--- a/src/change.c
+++ b/src/change.c
@@ -193,12 +193,16 @@ check_recorded_changes(
                        // can be merged.
                        di = dict_find(li->li_tv.vval.v_dict,
                                                          (char_u *)"end", -1);
-                       nr = tv_get_number(&di->di_tv);
-                       if (lnume > nr)
-                           di->di_tv.vval.v_number = lnume;
+                       if (di != NULL)
+                       {
+                           nr = tv_get_number(&di->di_tv);
+                           if (lnume > nr)
+                               di->di_tv.vval.v_number = lnume;
+                       }
                        di = dict_find(li->li_tv.vval.v_dict,
                                                        (char_u *)"added", -1);
-                       di->di_tv.vval.v_number += xtra;
+                       if (di != NULL)
+                           di->di_tv.vval.v_number += xtra;
                        return TRUE;
                    }
                }

diff --git a/src/memline.c b/src/memline.c
index 006a8b52df1f8806bf0f6a8460e94eab2d37d40a..8772c4a8e4eee6196640ebfc9cfe3599633f959e 100644 (file)
--- a/src/memline.c
+++ b/src/memline.c
@@ -1874,7 +1874,7 @@ recover_names(
            }
        }
 
-           /* check for out-of-memory */
+       // check for out-of-memory
        for (i = 0; i < num_names; ++i)
        {
            if (names[i] == NULL)
@@ -2101,7 +2101,7 @@ get_ctime(time_t thetime, int add_newline)
 # endif
     /* MSVC returns NULL for an invalid value of seconds. */
     if (curtime == NULL)
-       STRCPY(buf, _("(Invalid)"));
+       vim_strncpy((char_u *)buf, (char_u *)_("(Invalid)"), sizeof(buf) - 1);
     else
        (void)strftime(buf, sizeof(buf) - 1, "%a %b %d %H:%M:%S %Y", curtime);
 #else
@@ -3374,7 +3374,8 @@ ml_replace_len(
            if (newline != NULL)
            {
                mch_memmove(newline, line, len);
-               mch_memmove(newline + len, curbuf->b_ml.ml_line_ptr + oldtextlen, textproplen);
+               mch_memmove(newline + len, curbuf->b_ml.ml_line_ptr
+                                                   + oldtextlen, textproplen);
                vim_free(line);
                line = newline;
                len += (colnr_T)textproplen;

diff --git a/src/version.c b/src/version.c
index f32cd286f74cf9f8237364eb6cc13fe2468a490b..c31a98b449e0950c76f81993b907b03b7d83fc81 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1344,
 /**/
     1343,
 /**/