030-CVE-2018-6952.patch 770 B

12345678910111213141516171819202122232425
  1. From df40f2ea17254de269a3624319a12a93a4e395ff Mon Sep 17 00:00:00 2001
  2. From: Andreas Gruenbacher <agruen@gnu.org>
  3. Date: Fri, 17 Aug 2018 13:35:40 +0200
  4. Subject: [PATCH] Fix swapping fake lines in pch_swap
  5. * src/pch.c (pch_swap): Fix swapping p_bfake and p_efake when there is a
  6. blank line in the middle of a context-diff hunk: that empty line stays
  7. in the middle of the hunk and isn't swapped.
  8. Fixes: https://savannah.gnu.org/bugs/index.php?53133
  9. ---
  10. src/pch.c | 2 +-
  11. 1 file changed, 1 insertion(+), 1 deletion(-)
  12. --- a/src/pch.c
  13. +++ b/src/pch.c
  14. @@ -2115,7 +2115,7 @@ pch_swap (void)
  15. }
  16. if (p_efake >= 0) { /* fix non-freeable ptr range */
  17. if (p_efake <= i)
  18. - n = p_end - i + 1;
  19. + n = p_end - p_ptrn_lines;
  20. else
  21. n = -i;
  22. p_efake += n;