Remove unnecessary complication around xmlParseBalancedChunkMemory.

tglsfdc · tglsfdc · commit d5f014d897c8 · 2025-07-29T12:47:19.000-04:00
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
diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c
@@ -1883,24 +1883,16 @@ xml_parse(text *data, XmlOptionType xmloption_arg,
 			/* allow empty content */
 			if (*(utf8string + count))
 			{
-				xmlNodePtr	node_list = NULL;
-
 				res_code = xmlParseBalancedChunkMemory(doc, NULL, NULL, 0,
 													   utf8string + count,
-													   &node_list);
+													   parsed_nodes);
 				if (res_code != 0 || xmlerrcxt->err_occurred)
 				{
 					xml_errsave(escontext, xmlerrcxt,
 								ERRCODE_INVALID_XML_CONTENT,
 								"invalid XML content");
-					xmlFreeNodeList(node_list);
 					goto fail;
 				}
-
-				if (parsed_nodes != NULL)
-					*parsed_nodes = node_list;
-				else
-					xmlFreeNodeList(node_list);
 			}
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -1883,24 +1883,16 @@ xml_parse(text *data, XmlOptionType xmloption_arg,`
`1883`	`1883`	`/* allow empty content */`
`1884`	`1884`	`if (*(utf8string + count))`
`1885`	`1885`	`{`
`1886`		`- xmlNodePtr node_list = NULL;`
`1887`		`-`
`1888`	`1886`	`res_code = xmlParseBalancedChunkMemory(doc, NULL, NULL, 0,`
`1889`	`1887`	`utf8string + count,`
`1890`		`- &node_list);`
	`1888`	`+ parsed_nodes);`
`1891`	`1889`	`if (res_code != 0 \|\| xmlerrcxt->err_occurred)`
`1892`	`1890`	`{`
`1893`	`1891`	`xml_errsave(escontext, xmlerrcxt,`
`1894`	`1892`	`ERRCODE_INVALID_XML_CONTENT,`
`1895`	`1893`	`"invalid XML content");`
`1896`		`- xmlFreeNodeList(node_list);`
`1897`	`1894`	`goto fail;`
`1898`	`1895`	`}`
`1899`		`-`
`1900`		`- if (parsed_nodes != NULL)`
`1901`		`- *parsed_nodes = node_list;`
`1902`		`- else`
`1903`		`- xmlFreeNodeList(node_list);`
`1904`	`1896`	`}`
`1905`	`1897`	`}`
`1906`	`1898`