Commit de4b6cb2 authored by antirez's avatar antirez
Browse files

Merge branch 'unstable' of github.com:/antirez/redis into unstable

parents 8631e647 1ab3c823
...@@ -2027,10 +2027,11 @@ int rdbLoadRio(rio *rdb, rdbSaveInfo *rsi) { ...@@ -2027,10 +2027,11 @@ int rdbLoadRio(rio *rdb, rdbSaveInfo *rsi) {
lru_idle = -1; lru_idle = -1;
} }
/* Verify the checksum if RDB version is >= 5 */ /* Verify the checksum if RDB version is >= 5 */
if (rdbver >= 5 && server.rdb_checksum) { if (rdbver >= 5) {
uint64_t cksum, expected = rdb->cksum; uint64_t cksum, expected = rdb->cksum;
if (rioRead(rdb,&cksum,8) == 0) goto eoferr; if (rioRead(rdb,&cksum,8) == 0) goto eoferr;
if (server.rdb_checksum) {
memrev64ifbe(&cksum); memrev64ifbe(&cksum);
if (cksum == 0) { if (cksum == 0) {
serverLog(LL_WARNING,"RDB file was saved with checksum disabled: no check performed."); serverLog(LL_WARNING,"RDB file was saved with checksum disabled: no check performed.");
...@@ -2039,6 +2040,7 @@ int rdbLoadRio(rio *rdb, rdbSaveInfo *rsi) { ...@@ -2039,6 +2040,7 @@ int rdbLoadRio(rio *rdb, rdbSaveInfo *rsi) {
rdbExitReportCorruptRDB("RDB CRC error"); rdbExitReportCorruptRDB("RDB CRC error");
} }
} }
}
return C_OK; return C_OK;
eoferr: /* unexpected end of file is handled here with a fatal exit */ eoferr: /* unexpected end of file is handled here with a fatal exit */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment