summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Paquier2025-07-06 23:54:37 +0000
committerMichael Paquier2025-07-06 23:54:37 +0000
commitc911e7802e1de2a5a2d70e52b8d2b50ef768c2c1 (patch)
treef0fca94ec7992ac5eecc8b3d3adafa4bef4febc1
parentbcb8d47cdd5e894ea9625feb11a95901f8358bb4 (diff)
Fix incompatibility with libxml2 >= 2.14
libxml2 has deprecated the members of xmlBuffer, and it is recommended to access them with dedicated routines. We have only one case in the tree where this shows an impact: xml2/xpath.c where "content" was getting directly accessed. The rest of the code looked fine, checking the PostgreSQL code with libxml2 close to the top of its "2.14" branch. xmlBufferContent() exists since year 2000 based on a check of the upstream libxml2 tree, so let's switch to it. Like 400928b83bd2, backpatch all the way down as this can have an impact on all the branches already released once newer versions of libxml2 get more popular. Reported-by: Walid Ibrahim <[email protected]> Reviewed-by: Tom Lane <[email protected]> Discussion: https://postgr.es/m/[email protected] Backpatch-through: 13
-rw-r--r--contrib/xml2/xpath.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/xml2/xpath.c b/contrib/xml2/xpath.c
index 212cb74aa22..94bb31434c8 100644
--- a/contrib/xml2/xpath.c
+++ b/contrib/xml2/xpath.c
@@ -174,7 +174,7 @@ pgxmlNodeSetToText(xmlNodeSetPtr nodeset,
xmlBufferWriteCHAR(buf, toptagname);
xmlBufferWriteChar(buf, ">");
}
- result = xmlStrdup(buf->content);
+ result = xmlStrdup(xmlBufferContent(buf));
xmlBufferFree(buf);
return result;
}