mirror of
https://git.yoctoproject.org/poky
synced 2026-07-22 05:47:04 +00:00
Sona Sarmadi
a779191033
Upstream bug (contains reproducer): https://bugzilla.gnome.org/show_bug.cgi?id=756263 Upstream patch: https://git.gnome.org/browse/libxml2/commit/?id= ab2b9a93ff19cedde7befbf2fcc48c6e352b6cbe (From OE-Core rev: 84c6a67baaafee565ac4fad229bd8d07a21da09c) Signed-off-by: Tudor Florea <tudor.florea@enea.com> Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
42 lines
1.1 KiB
Diff
42 lines
1.1 KiB
Diff
From ab2b9a93ff19cedde7befbf2fcc48c6e352b6cbe Mon Sep 17 00:00:00 2001
|
|
From: Hugh Davenport <hugh@allthethings.co.nz>
|
|
Date: Tue, 3 Nov 2015 20:40:49 +0800
|
|
Subject: Avoid extra processing of MarkupDecl when EOF
|
|
|
|
For https://bugzilla.gnome.org/show_bug.cgi?id=756263
|
|
|
|
One place where ctxt->instate == XML_PARSER_EOF whic was set up
|
|
by entity detection issues doesn't get noticed, and even overrided
|
|
|
|
Fixes CVE-2015-8241.
|
|
|
|
Upstream-Status: Backport
|
|
|
|
Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
|
|
---
|
|
parser.c | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
diff --git a/parser.c b/parser.c
|
|
index d67b300..134afe7 100644
|
|
--- a/parser.c
|
|
+++ b/parser.c
|
|
@@ -6972,6 +6972,14 @@ xmlParseMarkupDecl(xmlParserCtxtPtr ctxt) {
|
|
xmlParsePI(ctxt);
|
|
}
|
|
}
|
|
+
|
|
+ /*
|
|
+ * detect requirement to exit there and act accordingly
|
|
+ * and avoid having instate overriden later on
|
|
+ */
|
|
+ if (ctxt->instate == XML_PARSER_EOF)
|
|
+ return;
|
|
+
|
|
/*
|
|
* This is only for internal subset. On external entities,
|
|
* the replacement is done before parsing stage
|
|
--
|
|
cgit v0.11.2
|
|
|