NotificationsYou must be signed in to change notification settings
Fork5.2k
Star19k

Commit762c6d8

committed

Remove unnecessary complication around xmlParseBalancedChunkMemory.

When I prepared71c0921 et al yesterday, I was thinking that thelogic involving explicitly freeing the node_list output was stillneeded to dodge leakage bugs in libxml2. But I was misremembering:we introduced that only because with early 2.13.x releases we couldnot trust xmlParseBalancedChunkMemory's result code, so we had tolook to see if a node list was returned or not. There's no reasonto believe that xmlParseBalancedChunkMemory will fail to clean upthe node list when required, so simplify. (This essentiallycompletes reverting all the non-cosmetic changes in6082b3d.)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.usBackpatch-through: 13

1 parentd861b92 commit762c6d8Copy full SHA for 762c6d8

File tree

1 file changed

-9

lines changed

src/backend/utils/adt
- xml.c

1 file changed

-9

lines changed

`‎src/backend/utils/adt/xml.c‎`

Lines changed: 1 addition & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -1862,24 +1862,16 @@ xml_parse(text *data, XmlOptionType xmloption_arg,`
`1862`	`1862`	`/* allow empty content */`
`1863`	`1863`	`if (*(utf8string+count))`
`1864`	`1864`	`{`
`1865`		`-xmlNodePtrnode_list=NULL;`
`1866`		`-`
`1867`	`1865`	`res_code=xmlParseBalancedChunkMemory(doc,NULL,NULL,0,`
`1868`	`1866`	`utf8string+count,`
`1869`		`-&node_list);`
	`1867`	`+parsed_nodes);`
`1870`	`1868`	`if (res_code!=0\|\|xmlerrcxt->err_occurred)`
`1871`	`1869`	`{`
`1872`	`1870`	`xml_errsave(escontext,xmlerrcxt,`
`1873`	`1871`	`ERRCODE_INVALID_XML_CONTENT,`
`1874`	`1872`	`"invalid XML content");`
`1875`		`-xmlFreeNodeList(node_list);`
`1876`	`1873`	`gotofail;`
`1877`	`1874`	`}`
`1878`		`-`
`1879`		`-if (parsed_nodes!=NULL)`
`1880`		`-*parsed_nodes=node_list;`
`1881`		`-else`
`1882`		`-xmlFreeNodeList(node_list);`
`1883`	`1875`	`}`
`1884`	`1876`	`}`
`1885`	`1877`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit762c6d8

File tree

1 file changed

1 file changed

`‎src/backend/utils/adt/xml.c‎`

0 commit comments