diff options
Diffstat (limited to 'src/backend/utils/adt/xml.c')
| -rw-r--r-- | src/backend/utils/adt/xml.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c index 0280c2625c6..c397461ad5d 100644 --- a/src/backend/utils/adt/xml.c +++ b/src/backend/utils/adt/xml.c @@ -1193,13 +1193,11 @@ xml_pstrdup_and_free(xmlChar *str) { result = pstrdup((char *) str); } - PG_CATCH(); + PG_FINALLY(); { xmlFree(str); - PG_RE_THROW(); } PG_END_TRY(); - xmlFree(str); } else result = NULL; @@ -3866,19 +3864,14 @@ xml_xmlnodetoxmltype(xmlNodePtr cur, PgXmlErrorContext *xmlerrcxt) result = xmlBuffer_to_xmltype(buf); } - PG_CATCH(); + PG_FINALLY() { if (nodefree) nodefree(cur_copy); if (buf) xmlBufferFree(buf); - PG_RE_THROW(); } PG_END_TRY(); - - if (nodefree) - nodefree(cur_copy); - xmlBufferFree(buf); } else { @@ -3893,13 +3886,11 @@ xml_xmlnodetoxmltype(xmlNodePtr cur, PgXmlErrorContext *xmlerrcxt) result = (xmltype *) cstring_to_text(escaped); pfree(escaped); } - PG_CATCH(); + PG_FINALLY(); { xmlFree(str); - PG_RE_THROW(); } PG_END_TRY(); - xmlFree(str); } return result; @@ -4734,16 +4725,13 @@ XmlTableGetValue(TableFuncScanState *state, int colnum, state->typioparams[colnum], typmod); } - PG_CATCH(); + PG_FINALLY(); { if (xpathobj != NULL) xmlXPathFreeObject(xpathobj); - PG_RE_THROW(); } PG_END_TRY(); - xmlXPathFreeObject(xpathobj); - return result; #else NO_XML_SUPPORT(); |