v2-0001-avoid-dereference-null-map.patch

application/octet-stream

Filename: v2-0001-avoid-dereference-null-map.patch
Type: application/octet-stream
Part: 0
Message: Re: support for MERGE

Patch

Format: unified
Series: patch v2-0001
File+
src/backend/executor/execPartition.c 4 1
diff --git a/src/backend/executor/execPartition.c b/src/backend/executor/execPartition.c
index aca42ca5b8..0c07b3d8b4 100644
--- a/src/backend/executor/execPartition.c
+++ b/src/backend/executor/execPartition.c
@@ -1530,7 +1530,10 @@ adjust_partition_colnos(List *colnos, ResultRelInfo *leaf_part_rri)
 {
 	TupleConversionMap *map = ExecGetChildToRootMap(leaf_part_rri);
 
-	return adjust_partition_colnos_using_map(colnos, map->attrMap);
+	if (map != NULL)
+		return adjust_partition_colnos_using_map(colnos, map->attrMap);
+	else
+		return colnos;
 }