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

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.
This commit is contained in:
Bram Moolenaar
2022-06-26 16:53:34 +01:00
parent cd38bb4d83
commit c101abff4c
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/diff.c
View File

@@ -403,9 +403,9 @@ diff_mark_adjust_tp(
// 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
@@ -426,6 +426,7 @@ diff_mark_adjust_tp(
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;
@@ -434,7 +435,6 @@ diff_mark_adjust_tp(
}
else
{
off = 0;
if (last < line2)
{
// 2. delete at end of diff

12
src/testdir/test_diffmode.vim
View File

@@ -1615,5 +1615,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

2
src/version.c
View File

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