*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/utils/fmgr/fmgr.c,v 1.84 2004/09/13 01:44:46 neilc Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/fmgr/fmgr.c,v 1.85 2004/10/01 20:39:54 tgl Exp $
*
*-------------------------------------------------------------------------
*/
{
Datum result;
FmgrInfo *save_flinfo;
- struct fmgr_security_definer_cache *fcache;
+ struct fmgr_security_definer_cache * volatile fcache;
AclId save_userid;
HeapTuple tuple;
fcache = fcinfo->flinfo->fn_extra;
save_flinfo = fcinfo->flinfo;
- fcinfo->flinfo = &fcache->flinfo;
-
save_userid = GetUserId();
- SetUserId(fcache->userid);
- result = FunctionCallInvoke(fcinfo);
- SetUserId(save_userid);
+
+ PG_TRY();
+ {
+ fcinfo->flinfo = &fcache->flinfo;
+ SetUserId(fcache->userid);
+
+ result = FunctionCallInvoke(fcinfo);
+ }
+ PG_CATCH();
+ {
+ fcinfo->flinfo = save_flinfo;
+ SetUserId(save_userid);
+ PG_RE_THROW();
+ }
+ PG_END_TRY();
fcinfo->flinfo = save_flinfo;
+ SetUserId(save_userid);
return result;
}