Fix a race when undoConnectWithMaster changes mi->repl_transfer_s but the connection is not yet closed and the event handler runs

This commit is contained in:
John Sully 2022-08-21 22:35:08 +00:00
parent 86f9888018
commit 1810f8af35

View File

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