gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash in save of masterinfo

Browse Source
This commit is contained in:
John Sully 2022-05-06 16:29:27 +00:00
parent 39974223eb
commit 4141746f8f
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rdb.cpp
View File

@ -1222,6 +1222,8 @@ int rdbSaveInfoAuxFields(rio *rdb, int rdbflags, rdbSaveInfo *rsi) {
sdsstring val = sdsstring(sdsempty()); sdsstring val = sdsstring(sdsempty());
for (auto &msi : rsi->vecmastersaveinfo) { for (auto &msi : rsi->vecmastersaveinfo) {
if (msi.masterhost == nullptr)
continue;
val = val.catfmt("%s:%I:%s:%i:%i;", msi.master_replid, val = val.catfmt("%s:%I:%s:%i:%i;", msi.master_replid,
msi.master_initial_offset, msi.master_initial_offset,
msi.masterhost.get(), msi.masterhost.get(),

3
src/server.h
View File

@ -1904,7 +1904,8 @@ struct MasterSaveInfo {
selected_db = 0; selected_db = 0;
} }
masterport = mi.masterport; masterport = mi.masterport;
masterhost = sdsstring(sdsdup(mi.masterhost)); if (mi.masterhost)
masterhost = sdsstring(sdsdup(mi.masterhost));
masterport = mi.masterport; masterport = mi.masterport;
} }