diff options
| -rw-r--r-- | src/backend/replication/walsender.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c index bbde1c32e73..7b44f9b0443 100644 --- a/src/backend/replication/walsender.c +++ b/src/backend/replication/walsender.c @@ -920,17 +920,23 @@ InitWalSnd(void) static void WalSndKill(int code, Datum arg) { - Assert(MyWalSnd != NULL); + WalSnd *walsnd = MyWalSnd; + + Assert(walsnd != NULL); + + /* + * Clear MyWalSnd first; then disown the latch. This is so that signal + * handlers won't try to touch the latch after it's no longer ours. + */ + MyWalSnd = NULL; + + DisownLatch(&walsnd->latch); /* * Mark WalSnd struct no longer in use. Assume that no lock is required * for this. */ - MyWalSnd->pid = 0; - DisownLatch(&MyWalSnd->latch); - - /* WalSnd struct isn't mine anymore */ - MyWalSnd = NULL; + walsnd->pid = 0; } /* |