mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-18 15:51:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

signs: fix overflow during adjustment on Windows (#14472)

Browse Source 
On Windows, `new_lnum + MAXLNUM` causes overflow and as a result the
line number of that sign becomes invalid negative number. This occurs
when the `set signcolumn=yes`, in other words `signcolumn` is not `auto`
and the sign column is less than 2 columns.

The related change was made in the commit
f2ed7605da. Originally the above addition
is only executed if `amount != MAXLNUM`, so reintroducing this check
fixes the bug and will hardly produces a new bug.

Fixes https://github.com/neovim/neovim/issues/14460
This commit is contained in:
statiolake
2021-05-02 07:35:52 +09:00
committed by GitHub
parent 993ca90c9b
commit b227cedf82
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/sign.c
View File

@@ -742,15 +742,15 @@ void sign_mark_adjust(
next = sign->se_next; next = sign->se_next;
new_lnum = sign->se_lnum; new_lnum = sign->se_lnum;
if (sign->se_lnum >= line1 && sign->se_lnum <= line2) { if (sign->se_lnum >= line1 && sign->se_lnum <= line2) {
if (amount == MAXLNUM && (!is_fixed || signcol >= 2)) { if (amount != MAXLNUM) {
new_lnum += amount;
} else if (!is_fixed || signcol >= 2) {
*lastp = next; *lastp = next;
if (next) { if (next) {
next->se_prev = last; next->se_prev = last;
} }
xfree(sign); xfree(sign);
continue; continue;
} else {
new_lnum += amount;
} }
} else if (sign->se_lnum > line2) { } else if (sign->se_lnum > line2) {
new_lnum += amount_after; new_lnum += amount_after;