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
a13106e0
Unverified
Commit
a13106e0
authored
Nov 28, 2017
by
Salvatore Sanfilippo
Committed by
GitHub
Nov 28, 2017
Browse files
Merge pull request #4374 from rouzier/patch-1
Fix file descriptor leak and error handling
parents
bf71b120
6eb99654
Changes
1
Show whitespace changes
Inline
Side-by-side
src/redis-check-rdb.c
View file @
a13106e0
...
...
@@ -193,12 +193,12 @@ int redis_check_rdb(char *rdbfilename, FILE *fp) {
buf
[
9
]
=
'\0'
;
if
(
memcmp
(
buf
,
"REDIS"
,
5
)
!=
0
)
{
rdbCheckError
(
"Wrong signature trying to load DB from file"
);
return
1
;
goto
err
;
}
rdbver
=
atoi
(
buf
+
5
);
if
(
rdbver
<
1
||
rdbver
>
RDB_VERSION
)
{
rdbCheckError
(
"Can't handle RDB format version %d"
,
rdbver
);
return
1
;
goto
err
;
}
startLoading
(
fp
);
...
...
@@ -270,7 +270,7 @@ int redis_check_rdb(char *rdbfilename, FILE *fp) {
}
else
{
if
(
!
rdbIsObjectType
(
type
))
{
rdbCheckError
(
"Invalid object type: %d"
,
type
);
return
1
;
goto
err
;
}
rdbstate
.
key_type
=
type
;
}
...
...
@@ -307,6 +307,7 @@ int redis_check_rdb(char *rdbfilename, FILE *fp) {
rdbCheckInfo
(
"RDB file was saved with checksum disabled: no check performed."
);
}
else
if
(
cksum
!=
expected
)
{
rdbCheckError
(
"RDB CRC error"
);
goto
err
;
}
else
{
rdbCheckInfo
(
"Checksum OK"
);
}
...
...
@@ -321,6 +322,8 @@ eoferr: /* unexpected end of file is handled here with a fatal exit */
}
else
{
rdbCheckError
(
"Unexpected EOF reading RDB file"
);
}
err:
if
(
closefile
)
fclose
(
fp
);
return
1
;
}
...
...
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