summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-06-10 14:52:35 +0100
committerBram Moolenaar <Bram@vim.org>2022-06-10 14:52:35 +0100
commitb74e04649168aec579183dfef70b8784d2afe993 (patch)
treec7d62b93637f7fa4a95a6505a56084cfca449f38
parentad73cc2ff2a8b5397ed20598757b702a4e686256 (diff)
downloadvim-git-b74e04649168aec579183dfef70b8784d2afe993.tar.gz
patch 8.2.5075: clang gives an out of bounds warningv8.2.5075
Problem: Clang gives an out of bounds warning. Solution: adjust conditional expression (John Marriott)
-rw-r--r--src/ui.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ui.c b/src/ui.c
index 08664bff6..8368c3054 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -897,7 +897,8 @@ read_from_input_buf(char_u *buf, long maxlen)
maxlen = inbufcount;
mch_memmove(buf, inbuf, (size_t)maxlen);
inbufcount -= maxlen;
- if (inbufcount)
+ // check "maxlen" to avoid clang warning
+ if (inbufcount > 0 && maxlen > 0)
mch_memmove(inbuf, inbuf + maxlen, (size_t)inbufcount);
return (int)maxlen;
}
diff --git a/src/version.c b/src/version.c
index a2a2d756c..d86a23d56 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 5075,
+/**/
5074,
/**/
5073,