search_plan_tree_patch_2.txt

text/plain

Filename: search_plan_tree_patch_2.txt

Type: text/plain

Part: 0

Message: Re: search_plan_tree(): handling of non-leaf CustomScanState nodes causes segfault

diff --git a/src/backend/executor/execCurrent.c b/src/backend/executor/execCurrent.c
index c7f909241b..fb3cf9537c 100644
--- a/src/backend/executor/execCurrent.c
+++ b/src/backend/executor/execCurrent.c
@@ -330,7 +330,8 @@ search_plan_tree(PlanState *node, Oid table_oid,
 			{
 				ScanState  *sstate = (ScanState *) node;
 
-				if (RelationGetRelid(sstate->ss_currentRelation) == table_oid)
+				if (sstate->ss_currentRelation &&
+					RelationGetRelid(sstate->ss_currentRelation) == table_oid)
 					result = sstate;
 				break;
 			}