diff options
| author | Joshua Lock <joshua.g.lock@intel.com> | 2016-01-15 15:10:51 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-20 17:08:28 +0000 |
| commit | d3ad918a712769e6e3ead7ad590f6a9fdac0c3dc (patch) | |
| tree | 634ad0fa930a958c207398a0a983c81b73627119 /meta/recipes-core/libxml/libxml2/CVE-2015-7942.patch | |
| parent | f9e5cc9e16ba1471ff7bf256aa1da28462143ccb (diff) | |
| download | ast2050-yocto-poky-d3ad918a712769e6e3ead7ad590f6a9fdac0c3dc.zip ast2050-yocto-poky-d3ad918a712769e6e3ead7ad590f6a9fdac0c3dc.tar.gz | |
libxml2: remove files for easier maintenance
Drop a couple of CVE fixes for easy cherry-picking from jethro.
The same fixes will be pack-ported from jethro in a following
patch.
(From OE-Core rev: 02fb45bada58f03c5571baf700934154e9fc57c2)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/libxml/libxml2/CVE-2015-7942.patch')
| -rw-r--r-- | meta/recipes-core/libxml/libxml2/CVE-2015-7942.patch | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/meta/recipes-core/libxml/libxml2/CVE-2015-7942.patch b/meta/recipes-core/libxml/libxml2/CVE-2015-7942.patch deleted file mode 100644 index a5930ed..0000000 --- a/meta/recipes-core/libxml/libxml2/CVE-2015-7942.patch +++ /dev/null @@ -1,55 +0,0 @@ -libxml2: CVE-2015-7942 - -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: 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 -https://git.gnome.org/browse/libxml2/patch/?id=9b8512337d14c8ddf662fcb98b0135f225a1c489 - -[YOCTO #8641] -Signed-off-by: Armin Kuster <akuster@mvista.com> - ---- - parser.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -Index: libxml2-2.9.2/parser.c -=================================================================== ---- libxml2-2.9.2.orig/parser.c -+++ libxml2-2.9.2/parser.c -@@ -6783,6 +6783,8 @@ xmlParseConditionalSections(xmlParserCtx - 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, -@@ -6843,6 +6845,8 @@ xmlParseConditionalSections(xmlParserCtx - 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, -@@ -6898,6 +6902,8 @@ xmlParseConditionalSections(xmlParserCtx - - } else { - xmlFatalErr(ctxt, XML_ERR_CONDSEC_INVALID_KEYWORD, NULL); -+ xmlStopParser(ctxt); -+ return; - } - - if (RAW == 0) |
