summaryrefslogtreecommitdiff
path: root/system/patch/CVE-2018-6952.patch
diff options
context:
space:
mode:
authorMax Rees <maxcrees@me.com>2019-07-22 11:29:38 -0400
committerMax Rees <maxcrees@me.com>2019-07-22 11:29:38 -0400
commit3f61500d4b0548ba68ab65add809e3fa3f5cbdf9 (patch)
tree325de9d017df47b7c9bc44a76fb86d03bfda0be2 /system/patch/CVE-2018-6952.patch
parentd3eb7058d8f66a7fa94c262314df4c95a76a36fc (diff)
downloadpackages-3f61500d4b0548ba68ab65add809e3fa3f5cbdf9.tar.gz
packages-3f61500d4b0548ba68ab65add809e3fa3f5cbdf9.tar.bz2
packages-3f61500d4b0548ba68ab65add809e3fa3f5cbdf9.tar.xz
packages-3f61500d4b0548ba68ab65add809e3fa3f5cbdf9.zip
system/patch: patch(!) for CVE-2018-6952, 2019-13636, 2019-13638
Diffstat (limited to 'system/patch/CVE-2018-6952.patch')
-rw-r--r--system/patch/CVE-2018-6952.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/system/patch/CVE-2018-6952.patch b/system/patch/CVE-2018-6952.patch
new file mode 100644
index 000000000..d9ad374a2
--- /dev/null
+++ b/system/patch/CVE-2018-6952.patch
@@ -0,0 +1,30 @@
+From 9c986353e420ead6e706262bf204d6e03322c300 Mon Sep 17 00:00:00 2001
+From: Andreas Gruenbacher <agruen@gnu.org>
+Date: Fri, 17 Aug 2018 13:35:40 +0200
+Subject: 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(-)
+
+diff --git a/src/pch.c b/src/pch.c
+index e92bc64..a500ad9 100644
+--- a/src/pch.c
++++ b/src/pch.c
+@@ -2122,7 +2122,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;
+--
+cgit v1.0-41-gc330
+