From 7833dab73c658e65f38553af89fd60c57a11ef49 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 27 May 2019 22:01:40 +0200 Subject: [PATCH] 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. --- src/charset.c | 9 +++++---- src/version.c | 2 ++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/charset.c b/src/charset.c index 171eccbfce..12e10e1989 100644 --- 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 1fa7db403e..b0cb4c1ded 100644 --- 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, /**/