diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2015-01-06 23:06:13 -0500 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2015-01-17 22:37:07 -0500 |
| commit | c975fa4713c2325623d7bbfd81806327234281ac (patch) | |
| tree | 9f37de4a6e62cc04bd98ebc725a323bdb1d59a1b /src/backend/utils/adt/xml.c | |
| parent | 1c49561762933b6d0502bd852cf4acbcbfedd66b (diff) | |
| download | postgresql-c975fa4713c2325623d7bbfd81806327234281ac.tar.gz postgresql-c975fa4713c2325623d7bbfd81806327234281ac.zip | |
Fix namespace handling in xpath function
Previously, the xml value resulting from an xpath query would not have
namespace declarations if the namespace declarations were attached to
an ancestor element in the input xml value. That means the output value
was not correct XML. Fix that by running the result value through
xmlCopyNode(), which produces the correct namespace declarations.
Author: Ali Akbar <the.apaan@gmail.com>
Diffstat (limited to 'src/backend/utils/adt/xml.c')
| -rw-r--r-- | src/backend/utils/adt/xml.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c index bfaf0a0be70..bcf058d9c3c 100644 --- a/src/backend/utils/adt/xml.c +++ b/src/backend/utils/adt/xml.c @@ -3286,19 +3286,34 @@ xml_xmlnodetoxmltype(xmlNodePtr cur) if (cur->type == XML_ELEMENT_NODE) { xmlBufferPtr buf; + xmlNodePtr cur_copy; buf = xmlBufferCreate(); + + /* + * The result of xmlNodeDump() won't contain namespace definitions + * from parent nodes, but xmlCopyNode() duplicates a node along with + * its required namespace definitions. + */ + cur_copy = xmlCopyNode(cur, 1); + + if (cur_copy == NULL) + xml_ereport(ERROR, ERRCODE_OUT_OF_MEMORY, + "could not copy node"); + PG_TRY(); { - xmlNodeDump(buf, NULL, cur, 0, 1); + xmlNodeDump(buf, NULL, cur_copy, 0, 1); result = xmlBuffer_to_xmltype(buf); } PG_CATCH(); { + xmlFreeNode(cur_copy); xmlBufferFree(buf); PG_RE_THROW(); } PG_END_TRY(); + xmlFreeNode(cur_copy); xmlBufferFree(buf); } else |