diff options
| author | Neil Conway <neilc@samurai.com> | 2008-01-12 10:50:03 +0000 |
|---|---|---|
| committer | Neil Conway <neilc@samurai.com> | 2008-01-12 10:50:03 +0000 |
| commit | 52176633720246efda688efcbeedb141ca598d00 (patch) | |
| tree | 8ab66943fc0b7045dfc93f3d71dc2c66431e2552 /src/backend/utils/adt/xml.c | |
| parent | 25b7583f67136e522b502ee2ad32ae630e521439 (diff) | |
| download | postgresql-52176633720246efda688efcbeedb141ca598d00.tar.gz postgresql-52176633720246efda688efcbeedb141ca598d00.zip | |
Fix two places in xml.c that neglected to check the return values of
SPI_prepare() and SPI_cursor_open(), to silence a Coverity warning.
Diffstat (limited to 'src/backend/utils/adt/xml.c')
| -rw-r--r-- | src/backend/utils/adt/xml.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c index 295e826576a..622d4e05f7f 100644 --- a/src/backend/utils/adt/xml.c +++ b/src/backend/utils/adt/xml.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/utils/adt/xml.c,v 1.65 2008/01/12 10:38:32 neilc Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/xml.c,v 1.66 2008/01/12 10:50:03 neilc Exp $ * *------------------------------------------------------------------------- */ @@ -2137,8 +2137,13 @@ query_to_xmlschema(PG_FUNCTION_ARGS) Portal portal; SPI_connect(); - plan = SPI_prepare(query, 0, NULL); - portal = SPI_cursor_open(NULL, plan, NULL, NULL, true); + + if ((plan = SPI_prepare(query, 0, NULL)) == NULL) + elog(ERROR, "SPI_prepare(\"%s\") failed", query); + + if ((portal = SPI_cursor_open(NULL, plan, NULL, NULL, true)) == NULL) + elog(ERROR, "SPI_cursor_open(\"%s\") failed", query); + result = _SPI_strdup(map_sql_table_to_xmlschema(portal->tupDesc, InvalidOid, nulls, tableforest, targetns)); @@ -2209,8 +2214,13 @@ query_to_xml_and_xmlschema(PG_FUNCTION_ARGS) Portal portal; SPI_connect(); - plan = SPI_prepare(query, 0, NULL); - portal = SPI_cursor_open(NULL, plan, NULL, NULL, true); + + if ((plan = SPI_prepare(query, 0, NULL)) == NULL) + elog(ERROR, "SPI_prepare(\"%s\") failed", query); + + if ((portal = SPI_cursor_open(NULL, plan, NULL, NULL, true)) == NULL) + elog(ERROR, "SPI_cursor_open(\"%s\") failed", query); + xmlschema = _SPI_strdup(map_sql_table_to_xmlschema(portal->tupDesc, InvalidOid, nulls, tableforest, targetns)); SPI_cursor_close(portal); |