database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-27 22:56:53 +03:00
Code

Remove xmlCleanupParser calls from contrib/xml2.

Browse Source 
These are unnecessary and probably dangerous.  I don't see any immediate
risk situations in the core XML support or contrib/xml2 itself, but there
could be issues with external uses of libxml2, and in any case it's an
accident waiting to happen.
This commit is contained in:
Tom Lane 2010-03-01 05:17:01 +00:00
parent 94152f93f5
commit a8ab473383
2 changed files with 4 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
contrib/xml2/xpath.c
View File

@ -139,12 +139,8 @@ xml_valid(PG_FUNCTION_ARGS)
doctree = xmlParseMemory((char *) VARDATA(t), docsize); doctree = xmlParseMemory((char *) VARDATA(t), docsize);
if (doctree == NULL) if (doctree == NULL)
{
xmlCleanupParser();
PG_RETURN_BOOL(false); /* i.e. not well-formed */ PG_RETURN_BOOL(false); /* i.e. not well-formed */
}
xmlFreeDoc(doctree); xmlFreeDoc(doctree);
xmlCleanupParser();
PG_RETURN_BOOL(true); PG_RETURN_BOOL(true);
} }
@ -302,7 +298,6 @@ xpath_nodeset(PG_FUNCTION_ARGS)
xpres = pgxml_result_to_text(pgxml_xpath(PG_GETARG_TEXT_P(0), xpath), xpres = pgxml_result_to_text(pgxml_xpath(PG_GETARG_TEXT_P(0), xpath),
toptag, septag, NULL); toptag, septag, NULL);
/* xmlCleanupParser(); done by result_to_text routine */
pfree(xpath); pfree(xpath);
if (xpres == NULL) if (xpres == NULL)
@ -337,7 +332,6 @@ xpath_list(PG_FUNCTION_ARGS)
xpres = pgxml_result_to_text(pgxml_xpath(PG_GETARG_TEXT_P(0), xpath), xpres = pgxml_result_to_text(pgxml_xpath(PG_GETARG_TEXT_P(0), xpath),
NULL, NULL, plainsep); NULL, NULL, plainsep);
/* xmlCleanupParser(); done by result_to_text routine */
pfree(xpath); pfree(xpath);
if (xpres == NULL) if (xpres == NULL)
@ -376,7 +370,6 @@ xpath_string(PG_FUNCTION_ARGS)
xpres = pgxml_result_to_text(pgxml_xpath(PG_GETARG_TEXT_P(0), xpath), xpres = pgxml_result_to_text(pgxml_xpath(PG_GETARG_TEXT_P(0), xpath),
NULL, NULL, NULL); NULL, NULL, NULL);
xmlCleanupParser();
pfree(xpath); pfree(xpath);
if (xpres == NULL) if (xpres == NULL)
@ -408,13 +401,10 @@ xpath_number(PG_FUNCTION_ARGS)
pfree(xpath); pfree(xpath);
if (res == NULL) if (res == NULL)
{
xmlCleanupParser();
PG_RETURN_NULL(); PG_RETURN_NULL();
}
fRes = xmlXPathCastToNumber(res); fRes = xmlXPathCastToNumber(res);
xmlCleanupParser();
if (xmlXPathIsNaN(fRes)) if (xmlXPathIsNaN(fRes))
PG_RETURN_NULL(); PG_RETURN_NULL();
@ -445,13 +435,10 @@ xpath_bool(PG_FUNCTION_ARGS)
pfree(xpath); pfree(xpath);
if (res == NULL) if (res == NULL)
{
xmlCleanupParser();
PG_RETURN_BOOL(false); PG_RETURN_BOOL(false);
}
bRes = xmlXPathCastToBoolean(res); bRes = xmlXPathCastToBoolean(res);
xmlCleanupParser();
PG_RETURN_BOOL(bRes); PG_RETURN_BOOL(bRes);
} }
@ -474,9 +461,7 @@ pgxml_xpath(text *document, xmlChar *xpath)
doctree = xmlParseMemory((char *) VARDATA(document), docsize); doctree = xmlParseMemory((char *) VARDATA(document), docsize);
if (doctree == NULL) if (doctree == NULL)
{ /* not well-formed */ return NULL; /* not well-formed */
return NULL;
}
ctxt = xmlXPathNewContext(doctree); ctxt = xmlXPathNewContext(doctree);
ctxt->node = xmlDocGetRootElement(doctree); ctxt->node = xmlDocGetRootElement(doctree);
@ -485,7 +470,6 @@ pgxml_xpath(text *document, xmlChar *xpath)
comppath = xmlXPathCompile(xpath); comppath = xmlXPathCompile(xpath);
if (comppath == NULL) if (comppath == NULL)
{ {
xmlCleanupParser();
xmlFreeDoc(doctree); xmlFreeDoc(doctree);
elog_error("XPath Syntax Error", true); elog_error("XPath Syntax Error", true);
} }
@ -497,7 +481,6 @@ pgxml_xpath(text *document, xmlChar *xpath)
if (res == NULL) if (res == NULL)
{ {
xmlXPathFreeContext(ctxt); xmlXPathFreeContext(ctxt);
/* xmlCleanupParser(); */
xmlFreeDoc(doctree); xmlFreeDoc(doctree);
return NULL; return NULL;
@ -517,10 +500,8 @@ pgxml_result_to_text(xmlXPathObjectPtr res,
text *xpres; text *xpres;
if (res == NULL) if (res == NULL)
{
xmlCleanupParser();
return NULL; return NULL;
}
switch (res->type) switch (res->type)
{ {
case XPATH_NODESET: case XPATH_NODESET:
@ -545,9 +526,6 @@ pgxml_result_to_text(xmlXPathObjectPtr res,
VARATT_SIZEP(xpres) = ressize + VARHDRSZ; VARATT_SIZEP(xpres) = ressize + VARHDRSZ;
/* Free various storage */ /* Free various storage */
xmlCleanupParser();
/* xmlFreeDoc(doctree); -- will die at end of tuple anyway */
xmlFree(xpresstr); xmlFree(xpresstr);
elog_error("XPath error", false); elog_error("XPath error", false);
@ -786,7 +764,6 @@ xpath_table(PG_FUNCTION_ARGS)
comppath = xmlXPathCompile(xpaths[j]); comppath = xmlXPathCompile(xpaths[j]);
if (comppath == NULL) if (comppath == NULL)
{ {
xmlCleanupParser();
xmlFreeDoc(doctree); xmlFreeDoc(doctree);
elog_error("XPath Syntax Error", true); elog_error("XPath Syntax Error", true);
} }
@ -851,8 +828,6 @@ xpath_table(PG_FUNCTION_ARGS)
pfree(xmldoc); pfree(xmldoc);
} }
xmlCleanupParser();
tuplestore_donestoring(tupstore); tuplestore_donestoring(tupstore);
SPI_finish(); SPI_finish();

4
contrib/xml2/xslt_proc.c
View File

@ -80,7 +80,6 @@ xslt_process(PG_FUNCTION_ARGS)
if (doctree == NULL) if (doctree == NULL)
{ {
xmlCleanupParser();
elog_error("Error parsing XML document", false); elog_error("Error parsing XML document", false);
PG_RETURN_NULL(); PG_RETURN_NULL();
@ -94,7 +93,6 @@ xslt_process(PG_FUNCTION_ARGS)
if (ssdoc == NULL) if (ssdoc == NULL)
{ {
xmlFreeDoc(doctree); xmlFreeDoc(doctree);
xmlCleanupParser();
elog_error("Error parsing stylesheet as XML document", false); elog_error("Error parsing stylesheet as XML document", false);
PG_RETURN_NULL(); PG_RETURN_NULL();
} }
@ -109,7 +107,6 @@ xslt_process(PG_FUNCTION_ARGS)
{ {
xmlFreeDoc(doctree); xmlFreeDoc(doctree);
xsltCleanupGlobals(); xsltCleanupGlobals();
xmlCleanupParser();
elog_error("Failed to parse stylesheet", false); elog_error("Failed to parse stylesheet", false);
PG_RETURN_NULL(); PG_RETURN_NULL();
} }
@ -122,7 +119,6 @@ xslt_process(PG_FUNCTION_ARGS)
xmlFreeDoc(doctree); xmlFreeDoc(doctree);
xsltCleanupGlobals(); xsltCleanupGlobals();
xmlCleanupParser();
if (resstat < 0) if (resstat < 0)
PG_RETURN_NULL(); PG_RETURN_NULL();