diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2023-09-18 14:27:47 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2023-09-18 14:27:47 -0400 |
| commit | 95f54f0d034eb69349f9134a01441a3cdd311419 (patch) | |
| tree | ec387aef10b12e5b57fa4d80735b5d51556c0d9e /src | |
| parent | 2679a107a152de3f88602a41f8651ec82e4d6205 (diff) | |
| download | postgresql-95f54f0d034eb69349f9134a01441a3cdd311419.tar.gz postgresql-95f54f0d034eb69349f9134a01441a3cdd311419.zip | |
Don't crash if cursor_to_xmlschema is used on a non-data-returning Portal.
cursor_to_xmlschema() assumed that any Portal must have a tupDesc,
which is not so. Add a defensive check.
It's plausible that this mistake occurred because of the rather
poorly chosen name of the lookup function SPI_cursor_find(),
which in such cases is returning something that isn't very much
like a cursor. Add some documentation to try to forestall future
errors of the same ilk.
Report and patch by Boyu Yang (docs changes by me). Back-patch
to all supported branches.
Discussion: https://postgr.es/m/dd343010-c637-434c-a8cb-418f53bda3b8.yangboyu.yby@alibaba-inc.com
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/utils/adt/xml.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c index 1ec6f1c2fd9..6411f56b998 100644 --- a/src/backend/utils/adt/xml.c +++ b/src/backend/utils/adt/xml.c @@ -2761,6 +2761,10 @@ cursor_to_xmlschema(PG_FUNCTION_ARGS) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_CURSOR), errmsg("cursor \"%s\" does not exist", name))); + if (portal->tupDesc == NULL) + ereport(ERROR, + (errcode(ERRCODE_INVALID_CURSOR_STATE), + errmsg("portal \"%s\" does not return tuples", name))); xmlschema = _SPI_strdup(map_sql_table_to_xmlschema(portal->tupDesc, InvalidOid, nulls, |