Exit correctly from PrepareRedoRemove() when not found

Complex crash bug all started with this failure.
Diagnosed and fixed by Nikhil Sontakke, reviewed by me.

Reported-by: Jeff Janes
Author: Nikhil Sontakke
Discussion: https://postgr.es/m/CAMkU=1xBP8cqdS5eK8APHL=X6RHMMM2vG5g+QamduuTsyCwv9g@mail.gmail.com
This commit is contained in:
Simon Riggs 2017-04-18 11:35:38 +01:00
parent aa203e7600
commit ee01f7092f

View File

@ -2375,6 +2375,7 @@ PrepareRedoRemove(TransactionId xid, bool giveWarning)
{ {
GlobalTransaction gxact = NULL; GlobalTransaction gxact = NULL;
int i; int i;
bool found = false;
Assert(RecoveryInProgress()); Assert(RecoveryInProgress());
@ -2386,6 +2387,7 @@ PrepareRedoRemove(TransactionId xid, bool giveWarning)
if (gxact->xid == xid) if (gxact->xid == xid)
{ {
Assert(gxact->inredo); Assert(gxact->inredo);
found = true;
break; break;
} }
} }
@ -2394,7 +2396,7 @@ PrepareRedoRemove(TransactionId xid, bool giveWarning)
/* /*
* Just leave if there is nothing, this is expected during WAL replay. * Just leave if there is nothing, this is expected during WAL replay.
*/ */
if (gxact == NULL) if (!found)
return; return;
/* /*