Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit e02fea0

Browse files
committed
Fix incompatibilities with libxml2 >= 2.12.0.
libxml2 changed the required signature of error handler callbacks to make the passed xmlError struct "const". This is causing build failures on buildfarm member caiman, and no doubt will start showing up in the field quite soon. Add a version check to adjust the declaration of xml_errorHandler() according to LIBXML_VERSION. 2.12.x also produces deprecation warnings for contrib/xml2/xpath.c's assignment to xmlLoadExtDtdDefaultValue. I see no good reason for that to still be there, seeing that we disabled external DTDs (at a lower level) years ago for security reasons. Let's just remove it. Back-patch to all supported branches, since they might all get built with newer libxml2 once it gets a bit more popular. (The back branches produce another deprecation warning about xpath.c's use of xmlSubstituteEntitiesDefault(). We ought to consider whether to back-patch all or part of commit 65c5864 to silence that. It's less urgent though, since it won't break the buildfarm.) Discussion: https://postgr.es/m/1389505.1706382262@sss.pgh.pa.us
1 parent b899e00 commit e02fea0

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

contrib/xml2/xpath.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ pgxml_parser_init(PgXmlStrictness strictness)
7575
xmlInitParser();
7676

7777
xmlSubstituteEntitiesDefault(1);
78-
xmlLoadExtDtdDefaultValue = 1;
7978

8079
return xmlerrcxt;
8180
}

src/backend/utils/adt/xml.c

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,16 @@
6666
#if LIBXML_VERSION >= 20704
6767
#define HAVE_XMLSTRUCTUREDERRORCONTEXT 1
6868
#endif
69+
70+
/*
71+
* libxml2 2.12 decided to insert "const" into the error handler API.
72+
*/
73+
#if LIBXML_VERSION >= 21200
74+
#define PgXmlErrorPtr const xmlError *
75+
#else
76+
#define PgXmlErrorPtr xmlErrorPtr
77+
#endif
78+
6979
#endif /* USE_LIBXML */
7080

7181
#include "access/htup_details.h"
@@ -123,7 +133,7 @@ static xmlParserInputPtr xmlPgEntityLoader(const char *URL, const char *ID,
123133
xmlParserCtxtPtr ctxt);
124134
static void xml_errsave(Node *escontext, PgXmlErrorContext *errcxt,
125135
int sqlcode, const char *msg);
126-
static void xml_errorHandler(void *data, xmlErrorPtr error);
136+
static void xml_errorHandler(void *data, PgXmlErrorPtr error);
127137
static int errdetail_for_xml_code(int code);
128138
static void chopStringInfoNewlines(StringInfo str);
129139
static void appendStringInfoLineSeparator(StringInfo str);
@@ -2002,7 +2012,7 @@ xml_errsave(Node *escontext, PgXmlErrorContext *errcxt,
20022012
* Error handler for libxml errors and warnings
20032013
*/
20042014
static void
2005-
xml_errorHandler(void *data, xmlErrorPtr error)
2015+
xml_errorHandler(void *data, PgXmlErrorPtr error)
20062016
{
20072017
PgXmlErrorContext *xmlerrcxt = (PgXmlErrorContext *) data;
20082018
xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) error->ctxt;

0 commit comments

Comments
 (0)