]> git.ipfire.org Git - thirdparty/postgresql.git/commitdiff
Remove unnecessary complication around xmlParseBalancedChunkMemory.
authorTom Lane <tgl@sss.pgh.pa.us>
Tue, 29 Jul 2025 16:47:20 +0000 (12:47 -0400)
committerTom Lane <tgl@sss.pgh.pa.us>
Tue, 29 Jul 2025 16:47:20 +0000 (12:47 -0400)
When I prepared 71c0921b6 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 6082b3d5d.)

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

src/backend/utils/adt/xml.c

index 1eda6f9b57e0ca8c7eca2c58fb01a7be02fc2970..279c15aa33116992b1fe092a19befe827218a444 100644 (file)
@@ -1622,14 +1622,9 @@ xml_parse(text *data, XmlOptionType xmloption_arg, bool preserve_whitespace,
                        /* allow empty content */
                        if (*(utf8string + count))
                        {
-                               xmlNodePtr      node_list = NULL;
-
                                res_code = xmlParseBalancedChunkMemory(doc, NULL, NULL, 0,
                                                                                                           utf8string + count,
-                                                                                                          &node_list);
-
-                               xmlFreeNodeList(node_list);
-
+                                                                                                          NULL);
                                if (res_code != 0 || xmlerrcxt->err_occurred)
                                        xml_ereport(xmlerrcxt, ERROR, ERRCODE_INVALID_XML_CONTENT,
                                                                "invalid XML content");