Avoid out-of-bounds read in errfinish if error_stack_depth < 0.

robertmhaas · robertmhaas · commit 9d140f7be283 · 2013-12-02T10:42:01.000-05:00
If errordata_stack_depth &lt; 0, we won't find that out and correct the
problem until CHECK_STACK_DEPTH() is invoked.  In the meantime,
elevel will be set based on an invalid read.  This is probably
harmless in practice, but it seems cleaner this way.

Xi Wang
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
@@ -397,12 +397,13 @@ void
 errfinish(int dummy,...)
 {
 	ErrorData  *edata = &errordata[errordata_stack_depth];
-	int			elevel = edata->elevel;
+	int			elevel;
 	MemoryContext oldcontext;
 	ErrorContextCallback *econtext;
 
 	recursion_depth++;
 	CHECK_STACK_DEPTH();
+	elevel = edata->elevel;
 
 	/*
 	 * Do processing in ErrorContext, which we hope has enough reserved space
