Rmys
96 lines
3.3 KiB
Diff
Executable File
96 lines
3.3 KiB
Diff
Executable File
From 9cd1c3cfbd32655d60572c0a413e017260c854df Mon Sep 17 00:00:00 2001
|
|
From: Daniel Veillard <veillard@redhat.com>
|
|
Date: Tue, 22 Apr 2014 15:30:56 +0800
|
|
Subject: Do not fetch external parameter entities
|
|
|
|
Unless explicitely asked for when validating or replacing entities
|
|
with their value. Problem pointed out by Daniel Berrange <berrange@redhat.com>
|
|
|
|
diff --git a/parser.c b/parser.c
|
|
index 9347ac9..c0dea05 100644
|
|
--- a/parser.c
|
|
+++ b/parser.c
|
|
@@ -2598,6 +2598,20 @@ xmlParserHandlePEReference(xmlParserCtxtPtr ctxt) {
|
|
xmlCharEncoding enc;
|
|
|
|
/*
|
|
+ * Note: external parsed entities will not be loaded, it is
|
|
+ * not required for a non-validating parser, unless the
|
|
+ * option of validating, or substituting entities were
|
|
+ * given. Doing so is far more secure as the parser will
|
|
+ * only process data coming from the document entity by
|
|
+ * default.
|
|
+ */
|
|
+ if ((entity->etype == XML_EXTERNAL_PARAMETER_ENTITY) &&
|
|
+ ((ctxt->options & XML_PARSE_NOENT) == 0) &&
|
|
+ ((ctxt->options & XML_PARSE_DTDVALID) == 0) &&
|
|
+ (ctxt->validate == 0))
|
|
+ return;
|
|
+
|
|
+ /*
|
|
* handle the extra spaces added before and after
|
|
* c.f. http://www.w3.org/TR/REC-xml#as-PE
|
|
* this is done independently.
|
|
--
|
|
cgit v0.10.1
|
|
|
|
From dd8367da17c2948981a51e52c8a6beb445edf825 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Veillard <veillard@redhat.com>
|
|
Date: Wed, 11 Jun 2014 16:54:32 +0800
|
|
Subject: Fix regressions introduced by CVE-2014-0191 patch
|
|
|
|
A number of issues have been raised after the fix, and this patch
|
|
tries to correct all of them, though most were related to
|
|
postvalidation.
|
|
https://bugzilla.gnome.org/show_bug.cgi?id=730290
|
|
and other reports on list, off-list and on Red Hat bugzilla
|
|
|
|
diff --git a/parser.c b/parser.c
|
|
index c0dea05..ba70f9e 100644
|
|
--- a/parser.c
|
|
+++ b/parser.c
|
|
@@ -2598,8 +2598,8 @@ xmlParserHandlePEReference(xmlParserCtxtPtr ctxt) {
|
|
xmlCharEncoding enc;
|
|
|
|
/*
|
|
- * Note: external parsed entities will not be loaded, it is
|
|
- * not required for a non-validating parser, unless the
|
|
+ * Note: external parameter entities will not be loaded, it
|
|
+ * is not required for a non-validating parser, unless the
|
|
* option of validating, or substituting entities were
|
|
* given. Doing so is far more secure as the parser will
|
|
* only process data coming from the document entity by
|
|
@@ -2608,6 +2608,9 @@ xmlParserHandlePEReference(xmlParserCtxtPtr ctxt) {
|
|
if ((entity->etype == XML_EXTERNAL_PARAMETER_ENTITY) &&
|
|
((ctxt->options & XML_PARSE_NOENT) == 0) &&
|
|
((ctxt->options & XML_PARSE_DTDVALID) == 0) &&
|
|
+ ((ctxt->options & XML_PARSE_DTDLOAD) == 0) &&
|
|
+ ((ctxt->options & XML_PARSE_DTDATTR) == 0) &&
|
|
+ (ctxt->replaceEntities == 0) &&
|
|
(ctxt->validate == 0))
|
|
return;
|
|
|
|
@@ -12616,6 +12619,9 @@ xmlIOParseDTD(xmlSAXHandlerPtr sax, xmlParserInputBufferPtr input,
|
|
return(NULL);
|
|
}
|
|
|
|
+ /* We are loading a DTD */
|
|
+ ctxt->options |= XML_PARSE_DTDLOAD;
|
|
+
|
|
/*
|
|
* Set-up the SAX context
|
|
*/
|
|
@@ -12743,6 +12749,9 @@ xmlSAXParseDTD(xmlSAXHandlerPtr sax, const xmlChar *ExternalID,
|
|
return(NULL);
|
|
}
|
|
|
|
+ /* We are loading a DTD */
|
|
+ ctxt->options |= XML_PARSE_DTDLOAD;
|
|
+
|
|
/*
|
|
* Set-up the SAX context
|
|
*/
|
|
--
|
|
cgit v0.10.1
|
|
|