Skip to content

Commit 059f30c

Browse files
committed
Properly terminate the array returned by GetLockConflicts().
GetLockConflicts() has for a long time not properly terminated the returned array. During normal processing the returned array is zero initialized which, while not pretty, is sufficient to be recognized as a invalid virtual transaction id. But the HotStandby case is more than aesthetically broken: The allocated (and reused) array is neither zeroed upon allocation, nor reinitialized, nor terminated. Not having a terminating element means that the end of the array will not be recognized and that recovery conflict handling will thus read ahead into adjacent memory. Only terminating when hitting memory content that looks like a invalid virtual transaction id. Luckily this seems so far not have caused significant problems, besides making recovery conflict more expensive. Discussion: 20150127142713.GD29457@awork2.anarazel.de Backpatch into all supported branches.
1 parent 3a20633 commit 059f30c

File tree

1 file changed

+4
-0
lines changed
  • src/backend/storage/lmgr

1 file changed

+4
-0
lines changed

src/backend/storage/lmgr/lock.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1944,6 +1944,8 @@ GetLockConflicts(const LOCKTAG *locktag, LOCKMODE lockmode)
19441944
* on this lockable object.
19451945
*/
19461946
LWLockRelease(partitionLock);
1947+
vxids[count].backendId = InvalidBackendId;
1948+
vxids[count].localTransactionId = InvalidLocalTransactionId;
19471949
return vxids;
19481950
}
19491951

@@ -1989,6 +1991,8 @@ GetLockConflicts(const LOCKTAG *locktag, LOCKMODE lockmode)
19891991
if (count > MaxBackends) /* should never happen */
19901992
elog(PANIC, "too many conflicting locks found");
19911993

1994+
vxids[count].backendId = InvalidBackendId;
1995+
vxids[count].localTransactionId = InvalidLocalTransactionId;
19921996
return vxids;
19931997
}
19941998

0 commit comments

Comments
 (0)