Commit18bdefa

Thomas G. Lockhart

committed

Fix reference to null pointer when no aggregate function candidates

are available. Problem reported by David Sauer <davids@iol.cz>.Modify information in resulting error message to indicate both agg name and data type.

1 parent5afe8d3 commit18bdefaCopy full SHA for 18bdefa

File tree

-4

lines changed

-4

lines changed

Lines changed: 4 additions & 4 deletions

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/parser/parse_func.c,v 1.35 1998/12/15 12:46:14 vadim Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.36 1998/12/23 14:38:40 thomas Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -225,7 +225,7 @@ agg_select_candidate(Oid typeid, CandidateList candidates)`
`225`	`225`	`}`
`226`	`226`	`}`
`227`	`227`	`/* otherwise, don't bother keeping this one around... */`
`228`		`-else`
	`228`	`+elseif (last_candidate!=NULL)`
`229`	`229`	`{`
`230`	`230`	`last_candidate->next=NULL;`
`231`	`231`	`}`
`@@ -399,8 +399,8 @@ ParseFuncOrColumn(ParseState pstate, char funcname, List *fargs,`
`399`	`399`	`}`
`400`	`400`	`else`
`401`	`401`	`{`
`402`		`-elog(ERROR,"Unable to select an aggregate functionfor type '%s'",`
`403`		`-typeidTypeName(basetype));`
	`402`	`+elog(ERROR,"Unable to select an aggregate function%s(%s)",`
	`403`	`+funcname,typeidTypeName(basetype));`
`404`	`404`	`}`
`405`	`405`	`}`
`406`	`406`

Comments

(0)