Only install a portal's ResourceOwner if it actually has one.

In most scenarios a portal without a ResourceOwner is dead and not subject
to any further execution, but a portal for a cursor WITH HOLD remains in
existence with no ResourceOwner after the creating transaction is over.
In this situation, if we attempt to "execute" the portal directly to fetch
data from it, we were setting CurrentResourceOwner to NULL, leading to a
segfault if the datatype output code did anything that required a resource
owner (such as trying to fetch system catalog entries that weren't already
cached).  The case appears to be impossible to provoke with stock libpq,
but psqlODBC at least is able to cause it when working with held cursors.

Simplest fix is to just skip the assignment to CurrentResourceOwner, so
that any resources used by the data output operations will be managed by
the transaction-level resource owner instead.  For consistency I changed
all the places that install a portal's resowner as current, even though
some of them are probably not reachable with a held cursor's portal.

Per report from Joshua Berry (with thanks to Hiroshi Inoue for developing
a self-contained test case).  Back-patch to all supported versions.

diff --git a/src/backend/commands/portalcmds.c b/src/backend/commands/portalcmds.c
index b5ce87a29d284bc7923ab47a87939ece94720214..03c7f0722ce34aa3d8b5f46ce7ad5c5aceef232f 100644 (file)
--- a/src/backend/commands/portalcmds.c
+++ b/src/backend/commands/portalcmds.c
@@ -274,7 +274,8 @@ PortalCleanup(Portal portal)
                        saveResourceOwner = CurrentResourceOwner;
                        PG_TRY();
                        {
-                               CurrentResourceOwner = portal->resowner;
+                               if (portal->resowner)
+                                       CurrentResourceOwner = portal->resowner;
                                ExecutorFinish(queryDesc);
                                ExecutorEnd(queryDesc);
                                FreeQueryDesc(queryDesc);
@@ -349,7 +350,8 @@ PersistHoldablePortal(Portal portal)
        PG_TRY();
        {
                ActivePortal = portal;
-               CurrentResourceOwner = portal->resowner;
+               if (portal->resowner)
+                       CurrentResourceOwner = portal->resowner;
                PortalContext = PortalGetHeapMemory(portal);
 
                MemoryContextSwitchTo(PortalContext);

diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c
index ce5e5e29ddb3a1f7a10f3fc407e0ee318935dacd..30140b187370c153195dfec26285cf1562da34e3 100644 (file)
--- a/src/backend/tcop/pquery.c
+++ b/src/backend/tcop/pquery.c
@@ -478,7 +478,8 @@ PortalStart(Portal portal, ParamListInfo params,
        PG_TRY();
        {
                ActivePortal = portal;
-               CurrentResourceOwner = portal->resowner;
+               if (portal->resowner)
+                       CurrentResourceOwner = portal->resowner;
                PortalContext = PortalGetHeapMemory(portal);
 
                oldContext = MemoryContextSwitchTo(PortalGetHeapMemory(portal));
@@ -762,7 +763,8 @@ PortalRun(Portal portal, long count, bool isTopLevel,
        PG_TRY();
        {
                ActivePortal = portal;
-               CurrentResourceOwner = portal->resowner;
+               if (portal->resowner)
+                       CurrentResourceOwner = portal->resowner;
                PortalContext = PortalGetHeapMemory(portal);
 
                MemoryContextSwitchTo(PortalContext);
@@ -1411,7 +1413,8 @@ PortalRunFetch(Portal portal,
        PG_TRY();
        {
                ActivePortal = portal;
-               CurrentResourceOwner = portal->resowner;
+               if (portal->resowner)
+                       CurrentResourceOwner = portal->resowner;
                PortalContext = PortalGetHeapMemory(portal);
 
                oldContext = MemoryContextSwitchTo(PortalContext);