Horton

Fix crash if LockErrorCleanup() is called twice

Heikki Linnakangas <heikki.linnakangas@iki.fi>

View on postgr.es
Commit: 51a0382e8d8793b5cc89b69285e5ecdffe03c2bf
Author: Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date: 2025-03-28T18:19:17Z
Releases: 18.0 
Fix crash if LockErrorCleanup() is called twice

The refactoring in commit 3c0fd64fec removed the clearing of
awaitedLock from LockErrorCleanup(). It's still needed, otherwise
LockErrorCleanup() during abort processing will try to update the
LOCALLOCK struct even after the lock has already been released. Put it
back.

Reported-by: Richard Guo <guofenglinux@gmail.com>
Reported-by: Robins Tharakan <tharakan@gmail.com>
Reported-by: Alexander Lakhin <exclusion@gmail.com>
Discussion: https://www.postgresql.org/message-id/flat/CAMbWs4_dNX1SzBmvFdoY-LxJh_4W_BjtVd5i008ihfU-wFF=eg@mail.gmail.com
Discussion: https://www.postgresql.org/message-id/18832-38e5575b1bbd7277@postgresql.org
Discussion: https://www.postgresql.org/message-id/e11a30e5-c0d8-491d-8546-3a1b50c10ad4@gmail.com

Files

PathChange+/−
src/backend/storage/lmgr/lock.c modified +9 −0
src/backend/storage/lmgr/proc.c modified +2 −0
src/include/storage/lock.h modified +1 −0

Discussion