diff options
Diffstat (limited to 'meta/recipes-core/libxml/libxml2/CVE-2015-7942-2-Fix-an-error-in-previous-Conditional-section-patch.patch')
-rw-r--r-- | meta/recipes-core/libxml/libxml2/CVE-2015-7942-2-Fix-an-error-in-previous-Conditional-section-patch.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-core/libxml/libxml2/CVE-2015-7942-2-Fix-an-error-in-previous-Conditional-section-patch.patch b/meta/recipes-core/libxml/libxml2/CVE-2015-7942-2-Fix-an-error-in-previous-Conditional-section-patch.patch new file mode 100644 index 0000000000..34b60362c3 --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/CVE-2015-7942-2-Fix-an-error-in-previous-Conditional-section-patch.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From 41ac9049a27f52e7a1f3b341f8714149fc88d450 Mon Sep 17 00:00:00 2001 | ||
2 | From: Daniel Veillard <veillard@redhat.com> | ||
3 | Date: Tue, 27 Oct 2015 10:53:44 +0800 | ||
4 | Subject: [PATCH] Fix an error in previous Conditional section patch | ||
5 | |||
6 | an off by one mistake in the change, led to error on correct | ||
7 | document where the end of the included entity was exactly | ||
8 | the end of the conditional section, leading to regtest failure | ||
9 | |||
10 | Upstream-Status: Backport | ||
11 | |||
12 | CVE-2015-7942-2 | ||
13 | |||
14 | Signed-off-by: Armin Kuster <akuster@mvista.com> | ||
15 | |||
16 | --- | ||
17 | parser.c | 2 +- | ||
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
19 | |||
20 | diff --git a/parser.c b/parser.c | ||
21 | index b9217ff..d67b300 100644 | ||
22 | --- a/parser.c | ||
23 | +++ b/parser.c | ||
24 | @@ -6916,7 +6916,7 @@ xmlParseConditionalSections(xmlParserCtxtPtr ctxt) { | ||
25 | NULL, NULL); | ||
26 | } | ||
27 | if ((ctxt-> instate != XML_PARSER_EOF) && | ||
28 | - ((ctxt->input->cur + 3) < ctxt->input->end)) | ||
29 | + ((ctxt->input->cur + 3) <= ctxt->input->end)) | ||
30 | SKIP(3); | ||
31 | } | ||
32 | } | ||
33 | -- | ||
34 | 2.3.5 | ||
35 | |||