diff options
| author | Rosen Penev <rosenp@gmail.com> | 2018-10-15 10:17:29 -0700 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2018-12-18 17:22:06 +0100 |
| commit | 27528d48e1f2a10b42ae6c9918f449b0c0911fa9 (patch) | |
| tree | 891317c3b652cdbc7b4efecac8e5806383242ffc /tools/patch/patches/030-CVE-2018-6952.patch | |
| parent | a10c67b05727ec8b773771f60127cac39ffa90f8 (diff) | |
| download | upstream-27528d48e1f2a10b42ae6c9918f449b0c0911fa9.tar.gz upstream-27528d48e1f2a10b42ae6c9918f449b0c0911fa9.tar.bz2 upstream-27528d48e1f2a10b42ae6c9918f449b0c0911fa9.zip | |
tools: patch: Add missing CVE-2018-6951 fix
uscan reports a new CVE now that PKG_CPE_ID was added.
Reordered patches by date.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
[re-title commit & refresh patches]
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(backported from a6bd9d0cb652686453604b762e80a35d023908c4)
Diffstat (limited to 'tools/patch/patches/030-CVE-2018-6952.patch')
| -rw-r--r-- | tools/patch/patches/030-CVE-2018-6952.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/tools/patch/patches/030-CVE-2018-6952.patch b/tools/patch/patches/030-CVE-2018-6952.patch new file mode 100644 index 0000000000..36b58c79dd --- /dev/null +++ b/tools/patch/patches/030-CVE-2018-6952.patch @@ -0,0 +1,25 @@ +From df40f2ea17254de269a3624319a12a93a4e395ff 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 +@@ -2115,7 +2115,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; |