diff options
| author | Thomas Deutschmann <whissi@gentoo.org> | 2019-03-28 01:32:30 +0100 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2019-03-28 01:33:05 +0100 |
| commit | 5c55ece4eee17a954740b8ecc03b1cb8ed58c123 (patch) | |
| tree | 2ea4e4d470d4a9e5e1c4b42319a5251d9f7082cb /sys-devel/patch/files/patch-2.7.6-CVE-2018-6952.patch | |
| parent | 5a73ccb22b2c9f366b930d4f921f52e9e5f11afc (diff) | |
| download | gentoo-5c55ece4eee17a954740b8ecc03b1cb8ed58c123.tar.gz gentoo-5c55ece4eee17a954740b8ecc03b1cb8ed58c123.tar.bz2 gentoo-5c55ece4eee17a954740b8ecc03b1cb8ed58c123.zip | |
sys-devel/patch: add patches for CVE-2018-{6951,6952}, CVE-2018-1000156
Bug: https://bugs.gentoo.org/647792
Bug: https://bugs.gentoo.org/647794
Bug: https://bugs.gentoo.org/652710
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'sys-devel/patch/files/patch-2.7.6-CVE-2018-6952.patch')
| -rw-r--r-- | sys-devel/patch/files/patch-2.7.6-CVE-2018-6952.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/sys-devel/patch/files/patch-2.7.6-CVE-2018-6952.patch b/sys-devel/patch/files/patch-2.7.6-CVE-2018-6952.patch new file mode 100644 index 000000000000..d9ad374a2ae7 --- /dev/null +++ b/sys-devel/patch/files/patch-2.7.6-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 + |