Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
1ab3c823
Unverified
Commit
1ab3c823
authored
May 23, 2018
by
Salvatore Sanfilippo
Committed by
GitHub
May 23, 2018
Browse files
Merge pull request #4908 from soloestoy/aof-rdb-preamble-compatible-checksum-no
AOF & RDB: be compatible with rdbchecksum no
parents
f1321349
edb92db5
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/rdb.c
View file @
1ab3c823
...
...
@@ -2027,16 +2027,18 @@ int rdbLoadRio(rio *rdb, rdbSaveInfo *rsi) {
lru_idle
=
-
1
;
}
/* Verify the checksum if RDB version is >= 5 */
if
(
rdbver
>=
5
&&
server
.
rdb_checksum
)
{
if
(
rdbver
>=
5
)
{
uint64_t
cksum
,
expected
=
rdb
->
cksum
;
if
(
rioRead
(
rdb
,
&
cksum
,
8
)
==
0
)
goto
eoferr
;
memrev64ifbe
(
&
cksum
);
if
(
cksum
==
0
)
{
serverLog
(
LL_WARNING
,
"RDB file was saved with checksum disabled: no check performed."
);
}
else
if
(
cksum
!=
expected
)
{
serverLog
(
LL_WARNING
,
"Wrong RDB checksum. Aborting now."
);
rdbExitReportCorruptRDB
(
"RDB CRC error"
);
if
(
server
.
rdb_checksum
)
{
memrev64ifbe
(
&
cksum
);
if
(
cksum
==
0
)
{
serverLog
(
LL_WARNING
,
"RDB file was saved with checksum disabled: no check performed."
);
}
else
if
(
cksum
!=
expected
)
{
serverLog
(
LL_WARNING
,
"Wrong RDB checksum. Aborting now."
);
rdbExitReportCorruptRDB
(
"RDB CRC error"
);
}
}
}
return
C_OK
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment