X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=tools%2Fpatch%2Fpatches%2F020-CVE-2018-6952.patch;fp=tools%2Fpatch%2Fpatches%2F020-CVE-2018-6952.patch;h=0000000000000000000000000000000000000000;hb=a6bd9d0cb652686453604b762e80a35d023908c4;hp=e72a8cbc27c2785283fffff05d6b56d5a7540e6d;hpb=3e633bb3709611d79965fab667e3239fd3bde151;p=openwrt%2F.git

diff --git a/tools/patch/patches/020-CVE-2018-6952.patch b/tools/patch/patches/020-CVE-2018-6952.patch
deleted file mode 100644
index e72a8cbc27..0000000000
--- a/tools/patch/patches/020-CVE-2018-6952.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From daa51e492049d9fe3ac049165ec19641bf19cd7f Mon Sep 17 00:00:00 2001
-From: Andreas Gruenbacher <agruen@gnu.org>
-Date: Fri, 17 Aug 2018 13:35:40 +0200
-Subject: [PATCH] Fix swapping fake lines in pch_swap
-
-* src/pch.c (pch_swap): Fix swapping p_bfake and p_efake when there is a
-blank line in the middle of a context-diff hunk: that empty line stays
-in the middle of the hunk and isn't swapped.
-
-Fixes: https://savannah.gnu.org/bugs/index.php?53133
----
- src/pch.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/src/pch.c
-+++ b/src/pch.c
-@@ -2114,7 +2114,7 @@ pch_swap (void)
-     }
-     if (p_efake >= 0) {			/* fix non-freeable ptr range */
- 	if (p_efake <= i)
--	    n = p_end - i + 1;
-+	    n = p_end - p_ptrn_lines;
- 	else
- 	    n = -i;
- 	p_efake += n;