From: Michael Paquier <michael@paquier.xyz>
Date: Sun, 6 Jul 2025 23:54:30 +0000 (+0900)
Subject: Fix incompatibility with libxml2 >= 2.14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2FREL_18_STABLE;p=thirdparty%2Fpostgresql.git

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 <walidib@amazon.com>
Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>
Discussion: https://postgr.es/m/aGdSdcR4QTjEHX6s@paquier.xyz
Backpatch-through: 13
---

diff --git a/contrib/xml2/xpath.c b/contrib/xml2/xpath.c
index 23d3f332dba..2820874cb5e 100644
--- a/contrib/xml2/xpath.c
+++ b/contrib/xml2/xpath.c
@@ -176,7 +176,7 @@ pgxmlNodeSetToText(xmlNodeSetPtr nodeset,
 		xmlBufferWriteCHAR(buf, toptagname);
 		xmlBufferWriteChar(buf, ">");
 	}
-	result = xmlStrdup(buf->content);
+	result = xmlStrdup(xmlBufferContent(buf));
 	xmlBufferFree(buf);
 	return result;
 }