select_required_plans(): pfree array if it's empty

funbringer · funbringer · commit 518038208a6c · 2017-04-15T03:11:45.000+03:00
diff --git a/src/nodes_common.c b/src/nodes_common.c
@@ -49,9 +49,12 @@ transform_plans_into_states(RuntimeAppendState *scan_state,
 
 	for (i = 0; i < n; i++)
 	{
-		ChildScanCommon		child = selected_plans[i];
+		ChildScanCommon		child;
 		PlanState		   *ps;
 
+		AssertArg(selected_plans);
+		child = selected_plans[i];
+
 		/* Create new node since this plan hasn't been used yet */
 		if (child->content_type != CHILD_PLAN_STATE)
 		{
@@ -109,6 +112,13 @@ select_required_plans(HTAB *children_table, Oid *parts, int nparts, int *nres)
 		result[used++] = child;
 	}
 
+	/* Get rid of useless array */
+	if (used == 0)
+	{
+		pfree(result);
+		result = NULL;
+	}
+
 	*nres = used;
 	return result;
 }

Original file line number	Diff line number	Diff line change
`@@ -49,9 +49,12 @@ transform_plans_into_states(RuntimeAppendState *scan_state,`
`49`	`49`
`50`	`50`	`for (i = 0; i < n; i++)`
`51`	`51`	`{`
`52`		`- ChildScanCommon child = selected_plans[i];`
	`52`	`+ ChildScanCommon child;`
`53`	`53`	`PlanState *ps;`
`54`	`54`
	`55`	`+ AssertArg(selected_plans);`
	`56`	`+ child = selected_plans[i];`
	`57`	`+`
`55`	`58`	`/* Create new node since this plan hasn't been used yet */`
`56`	`59`	`if (child->content_type != CHILD_PLAN_STATE)`
`57`	`60`	`{`
`@@ -109,6 +112,13 @@ select_required_plans(HTAB children_table, Oid parts, int nparts, int *nres)`
`109`	`112`	`result[used++] = child;`
`110`	`113`	`}`
`111`	`114`
	`115`	`+ /* Get rid of useless array */`
	`116`	`+ if (used == 0)`
	`117`	`+ {`
	`118`	`+ pfree(result);`
	`119`	`+ result = NULL;`
	`120`	`+ }`
	`121`	`+`
`112`	`122`	`*nres = used;`
`113`	`123`	`return result;`
`114`	`124`	`}`