diff options
author | Andrej Valek <andrej.valek@siemens.com> | 2017-09-06 08:04:59 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-11-05 22:33:20 +0000 |
commit | 7515e9f0bca31aaaf7460701101baf22808fd46a (patch) | |
tree | 9b624601e8acc168d9efb3c2cc36f7c7972ce896 /meta/recipes-core/libxml/libxml2/libxml2-CVE-2017-8872.patch | |
parent | 11a51afa58ae0e90c5ad9a3ca4b96be8bb980d5f (diff) | |
download | poky-7515e9f0bca31aaaf7460701101baf22808fd46a.tar.gz |
libxml2: 2.9.4 -> 2.9.5
(From OE-Core rev: a0d2427bb86668215d7c9e1be07cb9a2d86f6755)
Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/libxml/libxml2/libxml2-CVE-2017-8872.patch')
-rw-r--r-- | meta/recipes-core/libxml/libxml2/libxml2-CVE-2017-8872.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/meta/recipes-core/libxml/libxml2/libxml2-CVE-2017-8872.patch b/meta/recipes-core/libxml/libxml2/libxml2-CVE-2017-8872.patch deleted file mode 100644 index 26779aa572..0000000000 --- a/meta/recipes-core/libxml/libxml2/libxml2-CVE-2017-8872.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From d2f873a541c72b0f67e15562819bf98b884b30b7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Wed, 23 Aug 2017 16:04:49 +0800 | ||
4 | Subject: [PATCH] fix CVE-2017-8872 | ||
5 | |||
6 | this makes xmlHaltParser "empty" the buffer, as it resets cur and ava | ||
7 | il too here. | ||
8 | |||
9 | this seems to cure this specific issue, and also passes the testsuite | ||
10 | |||
11 | Signed-off-by: Marcus Meissner <meissner@suse.de> | ||
12 | |||
13 | https://bugzilla.gnome.org/show_bug.cgi?id=775200 | ||
14 | Upstream-Status: Backport [https://bugzilla.gnome.org/attachment.cgi?id=355527&action=diff] | ||
15 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
16 | --- | ||
17 | parser.c | 4 ++++ | ||
18 | 1 file changed, 4 insertions(+) | ||
19 | |||
20 | diff --git a/parser.c b/parser.c | ||
21 | index 9506ead..6c07ffd 100644 | ||
22 | --- a/parser.c | ||
23 | +++ b/parser.c | ||
24 | @@ -12664,6 +12664,10 @@ xmlHaltParser(xmlParserCtxtPtr ctxt) { | ||
25 | } | ||
26 | ctxt->input->cur = BAD_CAST""; | ||
27 | ctxt->input->base = ctxt->input->cur; | ||
28 | + if (ctxt->input->buf) { | ||
29 | + xmlBufEmpty (ctxt->input->buf->buffer); | ||
30 | + } else | ||
31 | + ctxt->input->length = 0; | ||
32 | } | ||
33 | } | ||
34 | |||
35 | -- | ||
36 | 2.7.4 | ||
37 | |||