c8h4/postgresql
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix rare core dump in BackendIdGetTransactionIds().

Browse source 
BackendIdGetTransactionIds() neglected the possibility that the PROC
pointer in a ProcState array entry is null.  In current usage, this could
only crash if the other backend had exited since pgstat_read_current_status
saw it as active, which is a pretty narrow window.  But it's reachable in
the field, per bug #12918 from Vladimir Borodin.

Back-patch to 9.4 where the faulty code was introduced.
This commit is contained in:
Tom Lane 2015-03-30 13:05:27 -04:00
parent 0633a60f4d
commit 701dcc983e
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/backend/storage/ipc/sinvaladt.c
View file

@ -403,9 +403,7 @@ BackendIdGetProc(int backendID)
void
BackendIdGetTransactionIds(int backendID, TransactionId *xid, TransactionId *xmin)
{
ProcState *stateP;
SISeg *segP = shmInvalBuffer;
PGXACT *xact;
*xid = InvalidTransactionId;
*xmin = InvalidTransactionId;
@ -415,11 +413,16 @@ BackendIdGetTransactionIds(int backendID, TransactionId *xid, TransactionId *xmi
if (backendID > 0 && backendID <= segP->lastBackend)
{
stateP = &segP->procState[backendID - 1];
xact = &ProcGlobal->allPgXact[stateP->proc->pgprocno];
ProcState *stateP = &segP->procState[backendID - 1];
PGPROC *proc = stateP->proc;
*xid = xact->xid;
*xmin = xact->xmin;
if (proc != NULL)
{
PGXACT *xact = &ProcGlobal->allPgXact[proc->pgprocno];
*xid = xact->xid;
*xmin = xact->xmin;
}
}
LWLockRelease(SInvalWriteLock);