summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-09-14 12:06:53 +0100
committerBram Moolenaar <Bram@vim.org>2022-09-14 12:06:53 +0100
commit98b373075e9a2ed642bc89f4f543e31d1428466f (patch)
treecbcfe1e273af6bccb52c3cf9f29535bcf28d5ece
parent470a14140bc06f1653edf26ab0b3c9b801080353 (diff)
patch 9.0.0462: ASAN warning for integer overflowv9.0.0462
Problem: ASAN warning for integer overflow. Solution: Check for tp_col to be MAXCOL.
-rw-r--r--src/textprop.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/textprop.c b/src/textprop.c
index d2536ce776..ba21e751bf 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -2289,7 +2289,7 @@ adjust_props_for_split(
*p = prop;
++prevprop.ga_len;
- if (p->tp_col + p->tp_len >= kept)
+ if (p->tp_col != MAXCOL && p->tp_col + p->tp_len >= kept)
p->tp_len = kept - p->tp_col;
if (cont_next)
p->tp_flags |= TP_FLAG_CONT_NEXT;
diff --git a/src/version.c b/src/version.c
index 62a43a7087..f1805666c3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 462,
+/**/
461,
/**/
460,