patch: apply upstream cve fixes
[openwrt/openwrt.git] / tools / patch / patches / 020-CVE-2018-6952.patch
1 From daa51e492049d9fe3ac049165ec19641bf19cd7f 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
6 * src/pch.c (pch_swap): Fix swapping p_bfake and p_efake when there is a
7 blank line in the middle of a context-diff hunk: that empty line stays
8 in the middle of the hunk and isn't swapped.
9
10 Fixes: https://savannah.gnu.org/bugs/index.php?53133
11 ---
12 src/pch.c | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15 diff --git a/src/pch.c b/src/pch.c
16 index 8150493..6994ab2 100644
17 --- a/src/pch.c
18 +++ b/src/pch.c
19 @@ -2114,7 +2114,7 @@ pch_swap (void)
20 }
21 if (p_efake >= 0) { /* fix non-freeable ptr range */
22 if (p_efake <= i)
23 - n = p_end - i + 1;
24 + n = p_end - p_ptrn_lines;
25 else
26 n = -i;
27 p_efake += n;
28 --
29 2.19.1
30