updated for version 7.3.017

Problem:    smatch reports errors.
Solution:   Fix the reported errors. (Dominique Pelle)

diff --git a/src/spell.c b/src/spell.c
index caffab6bededda01b5c24c11359ba778bd812d85..d34cc945926d25ddcf31d18b8f191547260954dc 100644 (file)
--- a/src/spell.c
+++ b/src/spell.c
@@ -4951,7 +4951,7 @@ typedef struct spellinfo_S
     char_u     *si_info;       /* info text chars or NULL  */
     int                si_region_count; /* number of regions supported (1 when there
                                    are no regions) */
-    char_u     si_region_name[16]; /* region names; used only if
+    char_u     si_region_name[17]; /* region names; used only if
                                     * si_region_count > 1) */
 
     garray_T   si_rep;         /* list of fromto_T entries from REP lines */
@@ -9530,7 +9530,8 @@ init_spellfile()
            if (aspath)
                /* Use directory of an entry with path, e.g., for
                 * "/dir/lg.utf-8.spl" use "/dir". */
-               vim_strncpy(buf, curbuf->b_s.b_p_spl, lstart - curbuf->b_s.b_p_spl - 1);
+               vim_strncpy(buf, curbuf->b_s.b_p_spl,
+                                           lstart - curbuf->b_s.b_p_spl - 1);
            else
                /* Copy the path from 'runtimepath' to buf[]. */
                copy_option_part(&rtp, buf, MAXPATHL, ",");
@@ -9539,13 +9540,14 @@ init_spellfile()
                /* Use the first language name from 'spelllang' and the
                 * encoding used in the first loaded .spl file. */
                if (aspath)
-                   vim_strncpy(buf, curbuf->b_s.b_p_spl, lend - curbuf->b_s.b_p_spl);
+                   vim_strncpy(buf, curbuf->b_s.b_p_spl,
+                                                 lend - curbuf->b_s.b_p_spl);
                else
                {
                    /* Create the "spell" directory if it doesn't exist yet. */
                    l = (int)STRLEN(buf);
                    vim_snprintf((char *)buf + l, MAXPATHL - l, "/spell");
-                   if (!filewritable(buf) != 2)
+                   if (filewritable(buf) != 2)
                        vim_mkdir(buf, 0755);
 
                    l = (int)STRLEN(buf);

diff --git a/src/syntax.c b/src/syntax.c
index fbc123cc1e732cf2ea01b85f9a5e124c0fabb960..d2a99a4f7985ceb43c9459d29c7b810f28d7bce5 100644 (file)
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -7600,10 +7600,10 @@ do_highlight(line, forceit, init)
                /*
                 * Copy characters from arg[] to buf[], translating <> codes.
                 */
-               for (p = arg, off = 0; off < 100 && *p; )
+               for (p = arg, off = 0; off < 100 - 6 && *p; )
                {
                    len = trans_special(&p, buf + off, FALSE);
-                   if (len)                /* recognized special char */
+                   if (len > 0)            /* recognized special char */
                        off += len;
                    else                    /* copy as normal char */
                        buf[off++] = *p++;

diff --git a/src/version.c b/src/version.c
index b3fc12e43a3062f1d0500d0655a02e3050562cc8..d04419c3c47304c51d81f9432fa14f32f313de6b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    17,
 /**/
     16,
 /**/