Skip to content
Permalink
Browse files Browse the repository at this point in the history
patch 9.0.0101: invalid memory access in diff mode with "dp" and undo
Problem:    Invalid memory access in diff mode with "dp" and undo.
Solution:   Make sure the line number does not go below one.
  • Loading branch information
brammool committed Jul 28, 2022
1 parent cb5ed4d commit 4e677b9
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 3 deletions.
9 changes: 6 additions & 3 deletions src/diff.c
Expand Up @@ -464,7 +464,10 @@ diff_mark_adjust_tp(
for (i = 0; i < DB_COUNT; ++i)
if (tp->tp_diffbuf[i] != NULL && i != idx)
{
dp->df_lnum[i] -= off;
if (dp->df_lnum[i] > off)
dp->df_lnum[i] -= off;
else
dp->df_lnum[i] = 1;
dp->df_count[i] += n;
}
}
Expand Down Expand Up @@ -2863,8 +2866,8 @@ ex_diffgetput(exarg_T *eap)
{
// remember deleting the last line of the buffer
buf_empty = curbuf->b_ml.ml_line_count == 1;
ml_delete(lnum);
--added;
if (ml_delete(lnum) == OK)
--added;
}
for (i = 0; i < dp->df_count[idx_from] - start_skip - end_skip; ++i)
{
Expand Down
14 changes: 14 additions & 0 deletions src/testdir/test_diffmode.vim
Expand Up @@ -1628,5 +1628,19 @@ func Test_diff_manipulations()
%bwipe!
endfunc

" This was causing the line number in the diff block to go below one.
" FIXME: somehow this causes a valgrind error when run directly but not when
" run as a test.
func Test_diff_put_and_undo()
set diff
next 0
split 00
sil! norm o0gguudpo0ggJuudp

bwipe!
bwipe!
set nodiff
endfunc


" vim: shiftwidth=2 sts=2 expandtab
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -735,6 +735,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
101,
/**/
100,
/**/
Expand Down

0 comments on commit 4e677b9

Please sign in to comment.