patch 7.4.2028

Problem:    cppcheck warns for using index before limits check.
Solution:   Swap the expressions. (Dominique Pelle)

diff --git a/src/mbyte.c b/src/mbyte.c
index 7bc184ba240b186b9a0c35fcd2753225f349e04d..f85d5ad60b1dbfbc09e9e938c71c6e0dfbbace32 100644 (file)
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -4357,7 +4357,7 @@ enc_locale(void)
        else
            s = p + 1;
     }
-    for (i = 0; s[i] != NUL && i < (int)sizeof(buf) - 1; ++i)
+    for (i = 0; i < (int)sizeof(buf) - 1 && s[i] != NUL; ++i)
     {
        if (s[i] == '_' || s[i] == '-')
            buf[i] = '-';

diff --git a/src/version.c b/src/version.c
index 93f3c03fa0617ed471edbd1407901a0c82a8f89a..6d75f76f1d5522f6adfe34ff25901e0c7c4e1c34 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2028,
 /**/
     2027,
 /**/