Merge pull request #92 from Snapchat/fix_sync_cancel_race

Fix a race when undoConnectWithMaster changes mi->repl_transfer_s but…
This commit is contained in:
John Sully 2022-08-22 13:35:29 -04:00 committed by GitHub Enterprise
commit 1f741154f1

View File

@ -2980,7 +2980,7 @@ void readSyncBulkPayload(connection *conn) {
rdbSaveInfo rsi;
redisMaster *mi = (redisMaster*)connGetPrivateData(conn);
static int usemark = 0;
if (mi == nullptr) {
if (mi == nullptr || conn != mi->repl_transfer_s) {
// We're about to be free'd so bail out
return;
}