Mercurial > vim

diff src/diff.c @ 29295:92dd6fef5ace v8.2.5164

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.5164: invalid memory access after diff buffer manipulations Commit: https://github.com/vim/vim/commit/c101abff4c6756db4f5e740fde289decb9452efa Author: Bram Moolenaar <Bram@vim.org> Date: Sun Jun 26 16:53:34 2022 +0100 patch 8.2.5164: invalid memory access after diff buffer manipulations Problem: Invalid memory access after diff buffer manipulations. Solution: Use zero offset when change removes all lines in a diff block.
author Bram Moolenaar <Bram@vim.org>
date Sun, 26 Jun 2022 18:00:02 +0200
parents bf4d7898cf93
children cc4b36422ecb
line wrap: on
line diff
--- a/src/diff.c
+++ b/src/diff.c
@@ -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