diff options
| author | Christian Kampka <christian@kampka.net> | 2015-11-28 21:20:17 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-11-30 08:38:37 +0000 |
| commit | ab861bea2f5d221406d2f6b1221de06bc48742ce (patch) | |
| tree | c2c10a177c39c79985aa429d89c19902ceff04e7 /main/libxml2/CVE-2014-0191.patch | |
| parent | 742549a3527667b42658e5b960cfe022a640c3bd (diff) | |
| download | aports-ab861bea2f5d221406d2f6b1221de06bc48742ce.tar.bz2 aports-ab861bea2f5d221406d2f6b1221de06bc48742ce.tar.xz | |
main/libxml: new upstream version 2.9.3
fixes #4797
Diffstat (limited to 'main/libxml2/CVE-2014-0191.patch')
| -rw-r--r-- | main/libxml2/CVE-2014-0191.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/main/libxml2/CVE-2014-0191.patch b/main/libxml2/CVE-2014-0191.patch deleted file mode 100644 index 4d5fe1a7aa..0000000000 --- a/main/libxml2/CVE-2014-0191.patch +++ /dev/null @@ -1,36 +0,0 @@ -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 - |