aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

patch 8.0.0583: fold test hangs on MS-Windows

Browse Source 
Problem:    Fold test hangs on MS-Windows.
Solution:   Avoid overflow in compare.
This commit is contained in:
Bram Moolenaar
2017-04-23 16:48:20 +02:00
parent 5b276aa80e
commit b11c826ddc
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/fold.c
View File

@@ -2928,7 +2928,7 @@ foldRemove(garray_T *gap, linenr_T top, linenr_T bot)
{ {
/* 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);
@@ -2970,10 +2970,12 @@ foldRemove(garray_T *gap, linenr_T top, linenr_T bot)
/* foldReverseOrder() {{{2 */ /* foldReverseOrder() {{{2 */
static void static void
foldReverseOrder(garray_T *gap, linenr_T start, linenr_T end) foldReverseOrder(garray_T *gap, linenr_T start_arg, linenr_T end_arg)
{ {
fold_T *left, *right; fold_T *left, *right;
fold_T tmp; fold_T tmp;
linenr_T start = start_arg;
linenr_T end = end_arg;
for (; start < end; start++, end--) for (; start < end; start++, end--)
{ {

2
src/version.c
View File

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