diff options
author | Matthias Klose <doko@ubuntu.com> | 2014-07-09 05:31:47 +0800 |
---|---|---|
committer | Aron Xu <aron@debian.org> | 2014-07-09 06:46:15 +0800 |
commit | 31231ea4641af8a1c69fad7ef16386456d2be29b (patch) | |
tree | 0462f8470af4a9c078f837b9d80d7128cd8af9ee /debian/patches/0029-Do-not-fetch-external-parameter-entities.patch | |
parent | f4286a98ba043cf61da3f246924e794ddcb6e255 (diff) | |
download | libxml2-31231ea4641af8a1c69fad7ef16386456d2be29b.tar.gz |
Add patch to fix python multiarch issue
Diffstat (limited to 'debian/patches/0029-Do-not-fetch-external-parameter-entities.patch')
-rw-r--r-- | debian/patches/0029-Do-not-fetch-external-parameter-entities.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/debian/patches/0029-Do-not-fetch-external-parameter-entities.patch b/debian/patches/0029-Do-not-fetch-external-parameter-entities.patch new file mode 100644 index 0000000..06ec27c --- /dev/null +++ b/debian/patches/0029-Do-not-fetch-external-parameter-entities.patch @@ -0,0 +1,35 @@ +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> +--- + parser.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/parser.c b/parser.c +index 7381a78..8aad7b4 100644 +--- a/parser.c ++++ b/parser.c +@@ -2595,6 +2595,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. |