From d1be7641f0e9a17db465f9d021343e15ddfe0a6a Mon Sep 17 00:00:00 2001 From: jbatista Date: Sun, 4 Nov 2018 13:06:32 +0000 Subject: [PATCH 1/2] Fix errors identified with cppcheck. --- eval.c | 4 ++-- random.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eval.c b/eval.c index a15bf6b..a2d4a25 100644 --- a/eval.c +++ b/eval.c @@ -808,8 +808,8 @@ static char *internal_getval(char *token) /* grab the line as an argument */ blen = bp->b_dotp->l_used - bp->b_doto; - if (blen > NSTRING) - blen = NSTRING; + if (blen >= NSTRING) + blen = NSTRING - 1; strncpy(buf, bp->b_dotp->l_text + bp->b_doto, blen); buf[blen] = 0; diff --git a/random.c b/random.c index 455661d..cca6eee 100644 --- a/random.c +++ b/random.c @@ -140,7 +140,7 @@ int getccol(int bflg) col |= tabmask; else if (c < 0x20 || c == 0x7F) ++col; - else if (c >= 0xc0 && c <= 0xa0) + else if (c >= 0xa0 && c <= 0xc0) col += 2; ++col; } From 8237384357dc8be302a4f3e5b19547a5972e31f4 Mon Sep 17 00:00:00 2001 From: jbatista Date: Tue, 5 Nov 2019 22:25:59 +0000 Subject: [PATCH 2/2] Align getccol() condition with getgoal() condition --- random.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/random.c b/random.c index cca6eee..05a9cfc 100644 --- a/random.c +++ b/random.c @@ -140,7 +140,7 @@ int getccol(int bflg) col |= tabmask; else if (c < 0x20 || c == 0x7F) ++col; - else if (c >= 0xa0 && c <= 0xc0) + else if (c >= 0x80 && c <= 0xa0) col += 2; ++col; }