# HG changeset patch # User Nick Wellnhofer <wellnhofer@aevum.de> # Date 1661170275 -7200 # Mon Aug 22 14:11:15 2022 +0200 # Node ID 26128413cae54a5586921993efe8edd0bf8babab # Parent ccce9ef71afc0069078fb992d04916763eb0db59 Remove htmlDefaultSAXHandler from non-SAX1 build This matches long-standing behavior of the XML counterpart. diff --git a/HTMLparser.c b/HTMLparser.c --- a/HTMLparser.c +++ b/HTMLparser.c @@ -6338,7 +6338,9 @@ if(enc==XML_CHAR_ENCODING_UTF8 || buf->encoder) ctxt->charset=XML_CHAR_ENCODING_UTF8; if (sax != NULL) { +#ifdef LIBXML_SAX1_ENABLED if (ctxt->sax != (xmlSAXHandlerPtr) &htmlDefaultSAXHandler) +#endif xmlFree(ctxt->sax); ctxt->sax = (htmlSAXHandlerPtr) xmlMalloc(sizeof(htmlSAXHandler)); if (ctxt->sax == NULL) { diff --git a/SAX2.c b/SAX2.c --- a/SAX2.c +++ b/SAX2.c @@ -2998,7 +2998,9 @@ void htmlDefaultSAXHandlerInit(void) { +#ifdef LIBXML_SAX1_ENABLED xmlSAX2InitHtmlDefaultSAXHandler((xmlSAXHandlerPtr) &htmlDefaultSAXHandler); +#endif } #endif /* LIBXML_HTML_ENABLED */ diff --git a/globals.c b/globals.c --- a/globals.c +++ b/globals.c @@ -405,7 +405,7 @@ xmlSAX2GetColumnNumber }; -#ifdef LIBXML_HTML_ENABLED +#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_SAX1_ENABLED) /** * htmlDefaultSAXHandler: * @@ -667,7 +667,7 @@ return(old); } -#ifdef LIBXML_HTML_ENABLED +#if defined(LIBXML_HTML_ENABLED) && defined(LIBXML_SAX1_ENABLED) #undef htmlDefaultSAXHandler xmlSAXHandlerV1 * __htmlDefaultSAXHandler(void) {