mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-07-11 20:09:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.5164: invalid memory access after diff buffer manipulations

Browse Source 
Problem:    Invalid memory access after diff buffer manipulations.
Solution:   Use zero offset when change removes all lines in a diff block.
c101abff4c
This commit is contained in:
zeertzjq
2022-07-25 20:09:23 +08:00
parent 8543de3a86
commit 771564b00e
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/diff.c
View File

@@ -372,9 +372,8 @@ static void diff_mark_adjust_tp(tabpage_T *tp, int idx, linenr_T line1, linenr_T
// 2. 3. 4. 5.: inserted/deleted lines touching this diff.
if (deleted > 0) {
off = 0;
if (dp->df_lnum[idx] >= line1) {
off = dp->df_lnum[idx] - lnum_deleted;
if (last <= line2) {
// 4. delete all lines of diff
if ((dp->df_next != NULL)
@@ -391,14 +390,13 @@ static void diff_mark_adjust_tp(tabpage_T *tp, int idx, linenr_T line1, linenr_T
dp->df_count[idx] = 0;
} else {
// 5. delete lines at or just before top of diff
off = dp->df_lnum[idx] - lnum_deleted;
n = off;
dp->df_count[idx] -= line2 - dp->df_lnum[idx] + 1;
check_unchanged = true;
}
dp->df_lnum[idx] = line1;
} else {
off = 0;
if (last < line2) {
// 2. delete at end of diff
dp->df_count[idx] -= last - lnum_deleted + 1;

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

@@ -1458,5 +1458,17 @@ func Test_diff_only()
%bwipe!
endfunc
" This was causing invalid diff block values
" FIXME: somehow this causes a valgrind error when run directly but not when
" run as a test.
func Test_diff_manipulations()
set diff
split 0
sil! norm R
doobdeuR
doobdeuR
doobdeu
set nodiff
%bwipe!
endfunc