IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix wrap-around in 32 bit

Browse Source
This commit is contained in:
Matthew Malcomson 2017-03-22 16:41:00 +00:00
parent b2b88423aa
commit 308a953e0b
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/nvim/fold.c
View File

@ -2507,6 +2507,8 @@ static void foldSplit(garray_T *gap, int i, linenr_T top, linenr_T bot)
fp = (fold_T *)gap->ga_data + i; fp = (fold_T *)gap->ga_data + i;
fp[1].fd_top = bot + 1; fp[1].fd_top = bot + 1;
// check for wrap around (MAXLNUM, and 32bit)
assert(fp[1].fd_top > bot);
fp[1].fd_len = fp->fd_len - (fp[1].fd_top - fp->fd_top); fp[1].fd_len = fp->fd_len - (fp[1].fd_top - fp->fd_top);
fp[1].fd_flags = fp->fd_flags; fp[1].fd_flags = fp->fd_flags;
fp[1].fd_small = MAYBE; fp[1].fd_small = MAYBE;
@ -2555,34 +2557,35 @@ static void foldRemove(garray_T *gap, linenr_T top, linenr_T bot)
{ {
fold_T *fp = NULL; fold_T *fp = NULL;
if (bot < top) if (bot < top) {
return; /* nothing to do */ return; // nothing to do
}
for (;; ) { for (;; ) {
/* Find fold that includes top or a following one. */ // Find fold that includes top or a following one.
if (foldFind(gap, top, &fp) && fp->fd_top < top) { if (foldFind(gap, top, &fp) && fp->fd_top < top) {
/* 2: or 3: need to delete nested folds */ // 2: or 3: need to delete nested folds
foldRemove(&fp->fd_nested, top - fp->fd_top, bot - fp->fd_top); foldRemove(&fp->fd_nested, top - fp->fd_top, bot - fp->fd_top);
if (fp->fd_top + fp->fd_len > bot + 1) { if (fp->fd_top + fp->fd_len - 1 > bot) {
/* 3: need to split it. */ // 3: need to split it.
foldSplit(gap, (int)(fp - (fold_T *)gap->ga_data), top, bot); foldSplit(gap, (int)(fp - (fold_T *)gap->ga_data), top, bot);
} else { } else {
/* 2: truncate fold at "top". */ // 2: truncate fold at "top".
fp->fd_len = top - fp->fd_top; fp->fd_len = top - fp->fd_top;
} }
fold_changed = TRUE; fold_changed = true;
continue; continue;
} }
if (fp >= (fold_T *)(gap->ga_data) + gap->ga_len if (fp >= (fold_T *)(gap->ga_data) + gap->ga_len
|| fp->fd_top > bot) { || fp->fd_top > bot) {
/* 6: Found a fold below bot, can stop looking. */ // 6: Found a fold below bot, can stop looking.
break; break;
} }
if (fp->fd_top >= top) { if (fp->fd_top >= top) {
/* Found an entry below top. */ // Found an entry below top.
fold_changed = TRUE; fold_changed = true;
if (fp->fd_top + fp->fd_len - 1 > bot) { if (fp->fd_top + fp->fd_len - 1 > bot) {
/* 5: Make fold that includes bot start below bot. */ // 5: Make fold that includes bot start below bot.
foldMarkAdjustRecurse(&fp->fd_nested, foldMarkAdjustRecurse(&fp->fd_nested,
(linenr_T)0, (long)(bot - fp->fd_top), (linenr_T)0, (long)(bot - fp->fd_top),
(linenr_T)MAXLNUM, (long)(fp->fd_top - bot - 1)); (linenr_T)MAXLNUM, (long)(fp->fd_top - bot - 1));
@ -2591,8 +2594,8 @@ static void foldRemove(garray_T *gap, linenr_T top, linenr_T bot)
break; break;
} }
/* 4: Delete completely contained fold. */ // 4: Delete completely contained fold.
deleteFoldEntry(gap, (int)(fp - (fold_T *)gap->ga_data), TRUE); deleteFoldEntry(gap, (int)(fp - (fold_T *)gap->ga_data), true);
} }
} }
} }