Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitbcd8528

Browse files
Use malloc() in GetLockConflicts() when called InHotStandby to avoid repeated
palloc calls. Current code assumed this was already true, so this is a bug fix.
1 parente0e8b96 commitbcd8528

File tree

1 file changed

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

1 file changed

+18
-4
lines changed

‎src/backend/storage/lmgr/lock.c

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/storage/lmgr/lock.c,v 1.191 2010/01/23 16:37:12 sriggs Exp $
11+
* $PostgreSQL: pgsql/src/backend/storage/lmgr/lock.c,v 1.192 2010/01/28 10:05:37 sriggs Exp $
1212
*
1313
* NOTES
1414
* A lock table is a shared memory hash table. When
@@ -1790,7 +1790,7 @@ LockReassignCurrentOwner(void)
17901790
VirtualTransactionId*
17911791
GetLockConflicts(constLOCKTAG*locktag,LOCKMODElockmode)
17921792
{
1793-
VirtualTransactionId*vxids;
1793+
staticVirtualTransactionId*vxids=NULL;
17941794
LOCKMETHODIDlockmethodid=locktag->locktag_lockmethodid;
17951795
LockMethodlockMethodTable;
17961796
LOCK*lock;
@@ -1812,8 +1812,22 @@ GetLockConflicts(const LOCKTAG *locktag, LOCKMODE lockmode)
18121812
* need enough space for MaxBackends + a terminator, since prepared xacts
18131813
* don't count.
18141814
*/
1815-
vxids= (VirtualTransactionId*)
1816-
palloc0(sizeof(VirtualTransactionId)* (MaxBackends+1));
1815+
if (!InHotStandby)
1816+
vxids= (VirtualTransactionId*)
1817+
palloc0(sizeof(VirtualTransactionId)* (MaxBackends+1));
1818+
else
1819+
{
1820+
if (vxids==NULL)
1821+
{
1822+
vxids= (VirtualTransactionId*)
1823+
malloc(sizeof(VirtualTransactionId)* (MaxBackends+1));
1824+
if (vxids==NULL)
1825+
ereport(ERROR,
1826+
(errcode(ERRCODE_OUT_OF_MEMORY),
1827+
errmsg("out of memory")));
1828+
1829+
}
1830+
}
18171831

18181832
/*
18191833
* Look up the lock object matching the tag.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp