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

vim-patch:9.0.0101: invalid memory access in diff mode with "dp" and undo (#19568)

Browse Source 
Problem:    Invalid memory access in diff mode with "dp" and undo.
Solution:   Make sure the line number does not go below one.
4e677b9c40
This commit is contained in:
zeertzjq
2022-07-29 07:31:54 +08:00
committed by GitHub
parent 352a177dae
commit 88ed33230a
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/nvim/diff.c
View File

@@ -419,10 +419,13 @@ static void diff_mark_adjust_tp(tabpage_T *tp, int idx, linenr_T line1, linenr_T
}
}
int i;
for (i = 0; i < DB_COUNT; i++) {
for (int 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;
}
}
@@ -2707,8 +2710,9 @@ void ex_diffgetput(exarg_T *eap)
for (i = 0; i < count; i++) {
// remember deleting the last line of the buffer
buf_empty = curbuf->b_ml.ml_line_count == 1;
ml_delete(lnum, false);
added--;
if (ml_delete(lnum, false) == OK) {
added--;
}
}
for (i = 0; i < dp->df_count[idx_from] - start_skip - end_skip; i++) {

14
src/nvim/testdir/test_diffmode.vim
View File

@@ -1471,5 +1471,19 @@ func Test_diff_manipulations()
doobdeu
set nodiff
%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