mirror of
https://github.com/postgres/postgres.git
synced 2025-08-27 07:42:10 +03:00
Fix oversight in PG_RE_THROW processing: it's entirely possible that there
isn't any place to throw the error to. If so, we should treat the error as FATAL, just as we would have if it'd been thrown outside the PG_TRY block to begin with. Although this is clearly a *potential* source of bugs, it is not clear at the moment whether it is an *actual* source of bugs; there may not presently be any PG_TRY blocks in code that can be reached with no outer longjmp catcher. So for the moment I'm going to be conservative and not back-patch this. The change breaks ABI for users of PG_RE_THROW and hence might create compatibility problems for loadable modules, so we should not put it into released branches without proof that it's needed.
This commit is contained in:
@@ -7,7 +7,7 @@
|
||||
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $PostgreSQL: pgsql/src/include/utils/elog.h,v 1.84 2007/03/02 23:37:23 tgl Exp $
|
||||
* $PostgreSQL: pgsql/src/include/utils/elog.h,v 1.85 2007/05/02 15:32:42 tgl Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -223,7 +223,7 @@ extern DLLIMPORT ErrorContextCallback *error_context_stack;
|
||||
} while (0)
|
||||
|
||||
#define PG_RE_THROW() \
|
||||
siglongjmp(*PG_exception_stack, 1)
|
||||
pg_re_throw()
|
||||
|
||||
extern DLLIMPORT sigjmp_buf *PG_exception_stack;
|
||||
|
||||
@@ -262,6 +262,7 @@ extern ErrorData *CopyErrorData(void);
|
||||
extern void FreeErrorData(ErrorData *edata);
|
||||
extern void FlushErrorState(void);
|
||||
extern void ReThrowError(ErrorData *edata);
|
||||
extern void pg_re_throw(void);
|
||||
|
||||
|
||||
/* GUC-configurable parameters */
|
||||
|
Reference in New Issue
Block a user