diff options
author | Bram Moolenaar <Bram@vim.org> | 2022-09-14 12:06:53 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2022-09-14 12:06:53 +0100 |
commit | 98b373075e9a2ed642bc89f4f543e31d1428466f (patch) | |
tree | cbcfe1e273af6bccb52c3cf9f29535bcf28d5ece | |
parent | 470a14140bc06f1653edf26ab0b3c9b801080353 (diff) | |
download | vim-git-98b373075e9a2ed642bc89f4f543e31d1428466f.tar.gz |
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.c | 2 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/textprop.c b/src/textprop.c index d2536ce77..ba21e751b 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 62a43a708..f1805666c 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, |