Archive/vim
1
0
Fork 0
mirror of https://github.com/vim/vim.git synced 2025-12-10 18:46:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

patch 9.1.1926: xdiff: Coverity warning with MAX_CNT/UINT_MAX usage

Browse Source 
Problem:  xdiff: Coverity warning with MAX_CNT/UINT_MAX usage
          (after v9.1.1921)
Solution: Replace XDL_MIN macro to a manual check.
          (Yee Cheng Chin)

In the recent xdiff upstream sync (#18765), MAX_CNT in xhistogram was
switched back to using UINT_MAX to match upstream. This exposed an issue
in xdiff that using using min() to compare against the max integer will
not work as the number will just overflow. Switch the check to be done
in a saturating add that respects integer overflow.

related: #18765
closes: #18792

Signed-off-by: Yee Cheng Chin <ychin.git@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Yee Cheng Chin
2025-11-23 19:24:10 +00:00
committed by Christian Brabandt
parent 898ac80be6
commit cf7c0038a4
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/version.c
View File

@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1926,
/**/
1925,
/**/

2
src/xdiff/xhistogram.c
View File

@ -122,7 +122,7 @@ static int scanA(struct histindex *index, int line1, int count1)
NEXT_PTR(index, ptr) = rec->ptr;
rec->ptr = ptr;
/* cap rec->cnt at MAX_CNT */
rec->cnt = XDL_MIN(MAX_CNT, rec->cnt + 1);
rec->cnt = (rec->cnt < MAX_CNT) ? rec->cnt + 1 : rec->cnt;
LINE_MAP(index, ptr) = rec;
goto continue_scan;
}