diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2007-07-21 22:12:32 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2007-07-21 22:12:32 +0000 |
| commit | 83630c88b9add09583c4cb9586e9d87ce83b3ddc (patch) | |
| tree | 4ab8e2802afcc331b28d8f5141f70472b42dfc36 /src | |
| parent | 6e606074e1548a0847040f6ec789867826a4b0f9 (diff) | |
| download | postgresql-83630c88b9add09583c4cb9586e9d87ce83b3ddc.tar.gz postgresql-83630c88b9add09583c4cb9586e9d87ce83b3ddc.zip | |
Fix elog.c to avoid infinite recursion (leading to backend crash) when
log_min_error_statement is active and there is some problem in logging the
current query string; for example, that it's too long to include in the log
message without running out of memory. This problem has existed since the
log_min_error_statement feature was introduced. No doubt the reason it
wasn't detected long ago is that 8.2 is the first release that defaults
log_min_error_statement to less than PANIC level.
Per report from Bill Moran.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/utils/error/elog.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c index 2186920d7e3..45c07178c13 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -37,7 +37,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.125.2.2 2005/10/20 01:31:50 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.125.2.3 2007/07/21 22:12:32 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -254,11 +254,16 @@ errstart(int elevel, const char *filename, int lineno, MemoryContextReset(ErrorContext); /* - * If we recurse more than once, the problem might be something - * broken in a context traceback routine. Abandon them too. + * If we recurse more than once, the problem might be something broken + * in a context traceback routine. Abandon them too. We also + * abandon attempting to print the error statement (which, if long, + * could itself be the source of the recursive failure). */ if (recursion_depth > 2) + { error_context_stack = NULL; + debug_query_string = NULL; + } } if (++errordata_stack_depth >= ERRORDATA_STACK_SIZE) { |