exit recursion fix from Massimo

This commit is contained in:
Bruce Momjian 1999-11-06 19:46:57 +00:00
parent 17d819c093
commit df723a8a8a
1 changed files with 5 additions and 4 deletions

View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.41 1999/11/06 17:01:28 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.42 1999/11/06 19:46:57 momjian Exp $
* *
* NOTES * NOTES
* *
@ -118,18 +118,19 @@ proc_exit(int code)
* If proc_exit is called too many times something bad is happening, so * If proc_exit is called too many times something bad is happening, so
* exit immediately. This is crafted in two if's for a reason. * exit immediately. This is crafted in two if's for a reason.
*/ */
if (proc_exit_inprogress == 9)
if (++proc_exit_inprogress == 9)
elog(ERROR, "infinite recursion in proc_exit"); elog(ERROR, "infinite recursion in proc_exit");
if (proc_exit_inprogress >= 9) if (proc_exit_inprogress >= 9)
goto exit; goto exit;
/* ---------------- /* ----------------
* if proc_exit_inprocess is true, then it means that we * if proc_exit_inprocess > 1, then it means that we
* are being invoked from within an on_exit() handler * are being invoked from within an on_exit() handler
* and so we return immediately to avoid recursion. * and so we return immediately to avoid recursion.
* ---------------- * ----------------
*/ */
if (proc_exit_inprogress++) if (proc_exit_inprogress > 1)
return; return;
/* do our shared memory exits first */ /* do our shared memory exits first */