Plug hole in dike: planner would coredump if query_planner

tglsfdc · tglsfdc · commit acf242da971b · 1999-06-12T19:27:41.000Z
returned NULL, which it will do in some cases where an elog(ERROR) would
probably be more appropriate.  For the moment, generate a not-very-
informative error message rather than proceeding to certain coredump.
Probably ought to think about making query_planner elog instead of
returning NULL, but this is at least a safe change for now.
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.55 1999/06/06 17:38:10 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.56 1999/06/12 19:27:41 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -223,6 +223,10 @@ union_planner(Query *parse)
 			pfree(vpm);
 	}
 
+	/* query_planner returns NULL if it thinks plan is bogus */
+	if (! result_plan)
+		elog(ERROR, "union_planner: failed to create plan");
+
 	/*
 	 * If we have a GROUP BY clause, insert a group node (with the
 	 * appropriate sort node.)

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.55 1999/06/06 17:38:10 tgl Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.56 1999/06/12 19:27:41 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -223,6 +223,10 @@ union_planner(Query *parse)`
`223`	`223`	`pfree(vpm);`
`224`	`224`	`}`
`225`	`225`
	`226`	`+ /* query_planner returns NULL if it thinks plan is bogus */`
	`227`	`+ if (! result_plan)`
	`228`	`+ elog(ERROR, "union_planner: failed to create plan");`
	`229`	`+`
`226`	`230`	`/*`
`227`	`231`	`* If we have a GROUP BY clause, insert a group node (with the`
`228`	`232`	`* appropriate sort node.)`