mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix core dump in contrib/xml2's xpath_table() when the input query returns

Browse Source 
a NULL value.  Per bug #4058.
This commit is contained in:
Tom Lane 2008-03-26 01:19:04 +00:00
parent c111a7211f
commit ff8a1204b4
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
contrib/xml2/xpath.c
View File

@ -803,12 +803,10 @@ xpath_table(PG_FUNCTION_ARGS)
xmlXPathCompExprPtr comppath;
/* Extract the row data as C Strings */
spi_tuple = tuptable->vals[i];
pkey = SPI_getvalue(spi_tuple, spi_tupdesc, 1);
xmldoc = SPI_getvalue(spi_tuple, spi_tupdesc, 2);
/*
* Clear the values array, so that not-well-formed documents return
* NULL in all columns.
@ -822,11 +820,14 @@ xpath_table(PG_FUNCTION_ARGS)
values[0] = pkey;
/* Parse the document */
doctree = xmlParseMemory(xmldoc, strlen(xmldoc));
if (xmldoc)
doctree = xmlParseMemory(xmldoc, strlen(xmldoc));
else /* treat NULL as not well-formed */
doctree = NULL;
if (doctree == NULL)
{ /* not well-formed, so output all-NULL tuple */
{
/* not well-formed, so output all-NULL tuple */
ret_tuple = BuildTupleFromCStrings(attinmeta, values);
oldcontext = MemoryContextSwitchTo(per_query_ctx);
tuplestore_puttuple(tupstore, ret_tuple);
@ -918,8 +919,10 @@ xpath_table(PG_FUNCTION_ARGS)
xmlFreeDoc(doctree);
pfree(pkey);
pfree(xmldoc);
if (pkey)
pfree(pkey);
if (xmldoc)
pfree(xmldoc);
}
xmlCleanupParser();