68 lines
2.2 KiB
Diff
68 lines
2.2 KiB
Diff
From ada244838be435acac2fd0f18c6a2282f1efe504 Mon Sep 17 00:00:00 2001
|
|
From: Nick Wellnhofer <wellnhofer@aevum.de>
|
|
Date: Tue, 26 Sep 2023 13:59:01 +0800
|
|
Subject: [PATCH] SAX: Always initialize SAX1 element handlers
|
|
|
|
Follow-up to commit d0c3f01e. A parser context will be initialized to
|
|
SAX version 2, but this can be overridden with XML_PARSE_SAX1 later,
|
|
so we must initialize the SAX1 element handlers as well.
|
|
|
|
Change the check in xmlDetectSAX2 to only look for XML_SAX2_MAGIC, so
|
|
we don't switch to SAX1 if the SAX2 element handlers are NULL.
|
|
---
|
|
SAX2.c | 11 +++++++----
|
|
parser.c | 5 ++---
|
|
2 files changed, 9 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/SAX2.c b/SAX2.c
|
|
index 6045ca1..10bc0a9 100644
|
|
--- a/SAX2.c
|
|
+++ b/SAX2.c
|
|
@@ -2839,20 +2839,23 @@ xmlSAXVersion(xmlSAXHandler *hdlr, int version)
|
|
{
|
|
if (hdlr == NULL) return(-1);
|
|
if (version == 2) {
|
|
- hdlr->startElement = NULL;
|
|
- hdlr->endElement = NULL;
|
|
hdlr->startElementNs = xmlSAX2StartElementNs;
|
|
hdlr->endElementNs = xmlSAX2EndElementNs;
|
|
hdlr->serror = NULL;
|
|
hdlr->initialized = XML_SAX2_MAGIC;
|
|
#ifdef LIBXML_SAX1_ENABLED
|
|
} else if (version == 1) {
|
|
- hdlr->startElement = xmlSAX2StartElement;
|
|
- hdlr->endElement = xmlSAX2EndElement;
|
|
hdlr->initialized = 1;
|
|
#endif /* LIBXML_SAX1_ENABLED */
|
|
} else
|
|
return(-1);
|
|
+#ifdef LIBXML_SAX1_ENABLED
|
|
+ hdlr->startElement = xmlSAX2StartElement;
|
|
+ hdlr->endElement = xmlSAX2EndElement;
|
|
+#else
|
|
+ hdlr->startElement = NULL;
|
|
+ hdlr->endElement = NULL;
|
|
+#endif /* LIBXML_SAX1_ENABLED */
|
|
hdlr->internalSubset = xmlSAX2InternalSubset;
|
|
hdlr->externalSubset = xmlSAX2ExternalSubset;
|
|
hdlr->isStandalone = xmlSAX2IsStandalone;
|
|
diff --git a/parser.c b/parser.c
|
|
index 93f89be..28170ac 100644
|
|
--- a/parser.c
|
|
+++ b/parser.c
|
|
@@ -1100,9 +1100,8 @@ static void
|
|
xmlDetectSAX2(xmlParserCtxtPtr ctxt) {
|
|
if (ctxt == NULL) return;
|
|
#ifdef LIBXML_SAX1_ENABLED
|
|
- if ((ctxt->sax) && (ctxt->sax->initialized == XML_SAX2_MAGIC) &&
|
|
- ((ctxt->sax->startElementNs != NULL) ||
|
|
- (ctxt->sax->endElementNs != NULL))) ctxt->sax2 = 1;
|
|
+ if ((ctxt->sax) && (ctxt->sax->initialized == XML_SAX2_MAGIC))
|
|
+ ctxt->sax2 = 1;
|
|
#else
|
|
ctxt->sax2 = 1;
|
|
#endif /* LIBXML_SAX1_ENABLED */
|
|
--
|
|
2.27.0
|
|
|