diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2007-07-21 22:12:17 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2007-07-21 22:12:17 +0000 |
| commit | 987b0664fbab1e7b5e88484ed3b8b200d2a27cd1 (patch) | |
| tree | 43e88c5d8e4cb5ff32d260d3ca22fd842328f676 /src | |
| parent | 6d8afdee000f719c8d63ae383053803935e880d9 (diff) | |
| download | postgresql-987b0664fbab1e7b5e88484ed3b8b200d2a27cd1.tar.gz postgresql-987b0664fbab1e7b5e88484ed3b8b200d2a27cd1.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 | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c index 5e1a807fd40..7446f37ffda 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -42,7 +42,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.167.2.4 2007/07/19 19:14:54 adunstan Exp $ + * $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.167.2.5 2007/07/21 22:12:17 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -260,10 +260,15 @@ errstart(int elevel, const char *filename, int lineno, /* * If we recurse more than once, the problem might be something broken - * in a context traceback routine. Abandon them too. + * 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) { |