caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-22 16:18:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4908 from soloestoy/aof-rdb-preamble-compatible-checksum-no

Browse Source 
AOF & RDB: be compatible with rdbchecksum no
This commit is contained in:
Salvatore Sanfilippo 2018-05-23 17:11:00 +02:00 committed by GitHub
commit 1ab3c82375
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/rdb.c
View File

@ -2027,16 +2027,18 @@ 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;
memrev64ifbe(&cksum); if (server.rdb_checksum) {
if (cksum == 0) { memrev64ifbe(&cksum);
serverLog(LL_WARNING,"RDB file was saved with checksum disabled: no check performed."); if (cksum == 0) {
} else if (cksum != expected) { serverLog(LL_WARNING,"RDB file was saved with checksum disabled: no check performed.");
serverLog(LL_WARNING,"Wrong RDB checksum. Aborting now."); } else if (cksum != expected) {
rdbExitReportCorruptRDB("RDB CRC error"); serverLog(LL_WARNING,"Wrong RDB checksum. Aborting now.");
rdbExitReportCorruptRDB("RDB CRC error");
}
} }
} }
return C_OK; return C_OK;