Skip to content

Commit 0ae8247

Browse files
committed
Remove unnecessary complication around xmlParseBalancedChunkMemory.
When I prepared 71c0921 et al yesterday, I was thinking that the logic involving explicitly freeing the node_list output was still needed to dodge leakage bugs in libxml2. But I was misremembering: we introduced that only because with early 2.13.x releases we could not trust xmlParseBalancedChunkMemory's result code, so we had to look to see if a node list was returned or not. There's no reason to believe that xmlParseBalancedChunkMemory will fail to clean up the node list when required, so simplify. (This essentially completes reverting all the non-cosmetic changes in 6082b3d.) Reported-by: Jim Jones <jim.jones@uni-muenster.de> Author: Tom Lane <tgl@sss.pgh.pa.us> Discussion: https://postgr.es/m/997668.1753802857@sss.pgh.pa.us Backpatch-through: 13
1 parent 907ac2c commit 0ae8247

File tree

1 file changed

+1
-6
lines changed
  • src/backend/utils/adt

1 file changed

+1
-6
lines changed

src/backend/utils/adt/xml.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1623,14 +1623,9 @@ xml_parse(text *data, XmlOptionType xmloption_arg, bool preserve_whitespace,
16231623
/* allow empty content */
16241624
if (*(utf8string + count))
16251625
{
1626-
xmlNodePtr node_list = NULL;
1627-
16281626
res_code = xmlParseBalancedChunkMemory(doc, NULL, NULL, 0,
16291627
utf8string + count,
1630-
&node_list);
1631-
1632-
xmlFreeNodeList(node_list);
1633-
1628+
NULL);
16341629
if (res_code != 0 || xmlerrcxt->err_occurred)
16351630
xml_ereport(xmlerrcxt, ERROR, ERRCODE_INVALID_XML_CONTENT,
16361631
"invalid XML content");

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy