mirror of
git://git.yoctoproject.org/poky
synced 2026-08-14 11:55:39 +00:00
9d44210c74
includes: CVE-2015-7941-1 CVE-2015-7941-2 (From OE-Core rev: e06312c71209b2e1d19c7df1434e409ad96b58be) Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
57 lines
1.5 KiB
Diff
57 lines
1.5 KiB
Diff
From 9b8512337d14c8ddf662fcb98b0135f225a1c489 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Veillard <veillard@redhat.com>
|
|
Date: Mon, 23 Feb 2015 11:29:20 +0800
|
|
Subject: [PATCH] Cleanup conditional section error handling
|
|
|
|
For https://bugzilla.gnome.org/show_bug.cgi?id=744980
|
|
|
|
The error handling of Conditional Section also need to be
|
|
straightened as the structure of the document can't be
|
|
guessed on a failure there and it's better to stop parsing
|
|
as further errors are likely to be irrelevant.
|
|
|
|
Upstream-Status: Backport
|
|
|
|
CVE-2015-7941-2
|
|
|
|
Signed-off-by: Armin Kuster <akuster@mvista.com>
|
|
|
|
---
|
|
parser.c | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
diff --git a/parser.c b/parser.c
|
|
index bbe97eb..fe603ac 100644
|
|
--- a/parser.c
|
|
+++ b/parser.c
|
|
@@ -6770,6 +6770,8 @@ xmlParseConditionalSections(xmlParserCtxtPtr ctxt) {
|
|
SKIP_BLANKS;
|
|
if (RAW != '[') {
|
|
xmlFatalErr(ctxt, XML_ERR_CONDSEC_INVALID, NULL);
|
|
+ xmlStopParser(ctxt);
|
|
+ return;
|
|
} else {
|
|
if (ctxt->input->id != id) {
|
|
xmlValidityError(ctxt, XML_ERR_ENTITY_BOUNDARY,
|
|
@@ -6830,6 +6832,8 @@ xmlParseConditionalSections(xmlParserCtxtPtr ctxt) {
|
|
SKIP_BLANKS;
|
|
if (RAW != '[') {
|
|
xmlFatalErr(ctxt, XML_ERR_CONDSEC_INVALID, NULL);
|
|
+ xmlStopParser(ctxt);
|
|
+ return;
|
|
} else {
|
|
if (ctxt->input->id != id) {
|
|
xmlValidityError(ctxt, XML_ERR_ENTITY_BOUNDARY,
|
|
@@ -6885,6 +6889,8 @@ xmlParseConditionalSections(xmlParserCtxtPtr ctxt) {
|
|
|
|
} else {
|
|
xmlFatalErr(ctxt, XML_ERR_CONDSEC_INVALID_KEYWORD, NULL);
|
|
+ xmlStopParser(ctxt);
|
|
+ return;
|
|
}
|
|
|
|
if (RAW == 0)
|
|
--
|
|
2.3.5
|
|
|