Commitbca96dd

committed

Fix crash of pg_stat_statements_info() without library loaded

Other code paths are already protected against this case, and _PG_init()warns about that in pg_stat_statements.c. While on it, I have checkedthe other extensions of the tree but did not notice any holes.Oversight in9fbc3f3.Author: Jaime CasanovaReviewed-by: Julien RouhaudDiscussion:https://postgr.es/m/CAJKUy5gF4=_=qhJ1VX_tSGFfjKHb9BvzhRYWSApJD=Bfwp2SBw@mail.gmail.com

1 parentf854c69 commitbca96ddCopy full SHA for bca96dd

File tree

-0

lines changed

-0

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1898,6 +1898,11 @@ pg_stat_statements_info(PG_FUNCTION_ARGS)`
`1898`	`1898`	`Datumvalues[PG_STAT_STATEMENTS_INFO_COLS];`
`1899`	`1899`	`boolnulls[PG_STAT_STATEMENTS_INFO_COLS];`
`1900`	`1900`
	`1901`	`+if (!pgss\|\| !pgss_hash)`
	`1902`	`+ereport(ERROR,`
	`1903`	`+(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),`
	`1904`	`+errmsg("pg_stat_statements must be loaded via shared_preload_libraries")));`
	`1905`	`+`
`1901`	`1906`	`/* Build a tuple descriptor for our result type */`
`1902`	`1907`	`if (get_call_result_type(fcinfo,NULL,&tupdesc)!=TYPEFUNC_COMPOSITE)`
`1903`	`1908`	`elog(ERROR,"return type must be a row type");`

Comments

(0)