diff options
Diffstat (limited to 'meta/recipes-core/libxml/libxml2/CVE-2023-39615-pre.patch')
-rw-r--r-- | meta/recipes-core/libxml/libxml2/CVE-2023-39615-pre.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/meta/recipes-core/libxml/libxml2/CVE-2023-39615-pre.patch b/meta/recipes-core/libxml/libxml2/CVE-2023-39615-pre.patch new file mode 100644 index 0000000000..b177cdaba0 --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/CVE-2023-39615-pre.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | From 99fc048d7f7292c5ee18e44c400bd73bc63a47ed Mon Sep 17 00:00:00 2001 | ||
2 | From: Nick Wellnhofer <wellnhofer@aevum.de> | ||
3 | Date: Fri, 14 Aug 2020 14:18:50 +0200 | ||
4 | Subject: [PATCH] Don't use SAX1 if all element handlers are NULL | ||
5 | |||
6 | Running xmllint with "--sax --noout" installs a SAX2 handler with all | ||
7 | callbacks set to NULL. In this case or similar situations, we don't want | ||
8 | to switch to SAX1 parsing. | ||
9 | |||
10 | Note: This patch is needed for "CVE-2023-39615-0002" patch to apply. | ||
11 | Without this patch the build will fail with undefined sax error. | ||
12 | |||
13 | Upstream-Status: Backport from [https://gitlab.gnome.org/GNOME/libxml2/-/commit/99fc048d7f7292c5ee18e44c400bd73bc63a47ed] | ||
14 | Signed-off-by: Siddharth Doshi <sdoshi@mvista.com> | ||
15 | --- | ||
16 | parser.c | 10 +++++++--- | ||
17 | 1 file changed, 7 insertions(+), 3 deletions(-) | ||
18 | |||
19 | diff --git a/parser.c b/parser.c | ||
20 | index bb677b0..6e09208 100644 | ||
21 | --- a/parser.c | ||
22 | +++ b/parser.c | ||
23 | @@ -1098,11 +1098,15 @@ xmlHasFeature(xmlFeature feature) | ||
24 | */ | ||
25 | static void | ||
26 | xmlDetectSAX2(xmlParserCtxtPtr ctxt) { | ||
27 | + xmlSAXHandlerPtr sax; | ||
28 | if (ctxt == NULL) return; | ||
29 | + sax = ctxt->sax; | ||
30 | #ifdef LIBXML_SAX1_ENABLED | ||
31 | - if ((ctxt->sax) && (ctxt->sax->initialized == XML_SAX2_MAGIC) && | ||
32 | - ((ctxt->sax->startElementNs != NULL) || | ||
33 | - (ctxt->sax->endElementNs != NULL))) ctxt->sax2 = 1; | ||
34 | + if ((sax) && (sax->initialized == XML_SAX2_MAGIC) && | ||
35 | + ((sax->startElementNs != NULL) || | ||
36 | + (sax->endElementNs != NULL) || | ||
37 | + ((sax->startElement == NULL) && (sax->endElement == NULL)))) | ||
38 | + ctxt->sax2 = 1; | ||
39 | #else | ||
40 | ctxt->sax2 = 1; | ||
41 | #endif /* LIBXML_SAX1_ENABLED */ | ||
42 | -- | ||
43 | 2.24.4 | ||
44 | |||