diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2007-10-13 20:46:47 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2007-10-13 20:46:47 +0000 |
| commit | ff1de5cef6c9bd938f50c1e251a77431c2eaa022 (patch) | |
| tree | edbb505ece0df342e097faeb21b2340ec3ea6e9f /src/backend/utils/adt/xml.c | |
| parent | 8468146b03c87f86162cee62e0de25f6e2d24b56 (diff) | |
| download | postgresql-ff1de5cef6c9bd938f50c1e251a77431c2eaa022.tar.gz postgresql-ff1de5cef6c9bd938f50c1e251a77431c2eaa022.zip | |
Guard against possible double free during error escape from XML
functions. Patch for the reported issue from Kris Jurka, some
other potential trouble spots plugged by Tom.
Diffstat (limited to 'src/backend/utils/adt/xml.c')
| -rw-r--r-- | src/backend/utils/adt/xml.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c index 537340811cb..2f243bd1913 100644 --- a/src/backend/utils/adt/xml.c +++ b/src/backend/utils/adt/xml.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/utils/adt/xml.c,v 1.48 2007/10/13 20:18:41 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/xml.c,v 1.49 2007/10/13 20:46:47 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -774,13 +774,17 @@ xmlvalidate(PG_FUNCTION_ARGS) #if 0 if (uri) xmlFreeURI(uri); + uri = NULL; #endif if (dtd) xmlFreeDtd(dtd); + dtd = NULL; if (doc) xmlFreeDoc(doc); + doc = NULL; if (ctxt) xmlFreeParserCtxt(ctxt); + ctxt = NULL; xmlCleanupParser(); } PG_CATCH(); @@ -1163,13 +1167,13 @@ xml_parse(text *data, XmlOptionType xmloption_arg, bool preserve_whitespace, xml if (ctxt) xmlFreeParserCtxt(ctxt); + ctxt = NULL; xmlCleanupParser(); } PG_CATCH(); { if (doc) xmlFreeDoc(doc); - doc = NULL; if (ctxt) xmlFreeParserCtxt(ctxt); xmlCleanupParser(); @@ -3203,10 +3207,12 @@ xpath(PG_FUNCTION_ARGS) "invalid XPath expression"); /* TODO: show proper XPath error details */ xpathobj = xmlXPathCompiledEval(xpathcomp, xpathctx); - xmlXPathFreeCompExpr(xpathcomp); if (xpathobj == NULL) ereport(ERROR, (errmsg("could not create XPath object"))); /* TODO: reason? */ + xmlXPathFreeCompExpr(xpathcomp); + xpathcomp = NULL; + /* return empty array in cases when nothing is found */ if (xpathobj->nodesetval == NULL) res_nitems = 0; @@ -3225,9 +3231,13 @@ xpath(PG_FUNCTION_ARGS) } xmlXPathFreeObject(xpathobj); + xpathobj = NULL; xmlXPathFreeContext(xpathctx); - xmlFreeParserCtxt(ctxt); + xpathctx = NULL; xmlFreeDoc(doc); + doc = NULL; + xmlFreeParserCtxt(ctxt); + ctxt = NULL; xmlCleanupParser(); } PG_CATCH(); |