patch 8.1.1411: Coverity warns for divide by zero

Problem:    Coverity warns for divide by zero.
Solution:   Make sure width is larger than zero.

diff --git a/src/charset.c b/src/charset.c
index 171eccbfce2fed5d0bb49ad5d82500c8714ef29e..12e10e198998d1a01336160841c02d39410d228b 100644 (file)
--- a/src/charset.c
+++ b/src/charset.c
@@ -1105,15 +1105,16 @@ win_lbr_chartabsize(
            {
                if (size + sbrlen + numberwidth > (colnr_T)wp->w_width)
                {
-                   /* calculate effective window width */
+                   // calculate effective window width
                    int width = (colnr_T)wp->w_width - sbrlen - numberwidth;
                    int prev_width = col
                                 ? ((colnr_T)wp->w_width - (sbrlen + col)) : 0;
-                   if (width == 0)
-                       width = (colnr_T)wp->w_width;
+
+                   if (width <= 0)
+                       width = (colnr_T)1;
                    added += ((size - prev_width) / width) * vim_strsize(p_sbr);
                    if ((size - prev_width) % width)
-                       /* wrapped, add another length of 'sbr' */
+                       // wrapped, add another length of 'sbr'
                        added += vim_strsize(p_sbr);
                }
                else

diff --git a/src/version.c b/src/version.c
index 1fa7db403e3311b6884e95e8858cd980221a4010..b0cb4c1ded4b96f1fe40b353dcd05987c897204a 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 */
+/**/
+    1411,
 /**/
     1410,
 /**/