Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
9387f733
Commit
9387f733
authored
Jan 07, 2020
by
WuYunlong
Browse files
Fix potential memory leak of clusterLoadConfig().
parent
2f8134a7
Changes
1
Show whitespace changes
Inline
Side-by-side
src/cluster.c
View file @
9387f733
...
...
@@ -157,7 +157,10 @@ int clusterLoadConfig(char *filename) {
}
/* Regular config lines have at least eight fields */
if
(
argc
<
8
)
goto
fmterr
;
if
(
argc
<
8
)
{
sdsfreesplitres
(
argv
,
argc
);
goto
fmterr
;
}
/* Create this node if it does not exist */
n
=
clusterLookupNode
(
argv
[
0
]);
...
...
@@ -166,7 +169,10 @@ int clusterLoadConfig(char *filename) {
clusterAddNode
(
n
);
}
/* Address and port */
if
((
p
=
strrchr
(
argv
[
1
],
':'
))
==
NULL
)
goto
fmterr
;
if
((
p
=
strrchr
(
argv
[
1
],
':'
))
==
NULL
)
{
sdsfreesplitres
(
argv
,
argc
);
goto
fmterr
;
}
*
p
=
'\0'
;
memcpy
(
n
->
ip
,
argv
[
1
],
strlen
(
argv
[
1
])
+
1
);
char
*
port
=
p
+
1
;
...
...
@@ -247,7 +253,10 @@ int clusterLoadConfig(char *filename) {
*
p
=
'\0'
;
direction
=
p
[
1
];
/* Either '>' or '<' */
slot
=
atoi
(
argv
[
j
]
+
1
);
if
(
slot
<
0
||
slot
>=
CLUSTER_SLOTS
)
goto
fmterr
;
if
(
slot
<
0
||
slot
>=
CLUSTER_SLOTS
)
{
sdsfreesplitres
(
argv
,
argc
);
goto
fmterr
;
}
p
+=
3
;
cn
=
clusterLookupNode
(
p
);
if
(
!
cn
)
{
...
...
@@ -267,8 +276,14 @@ int clusterLoadConfig(char *filename) {
}
else
{
start
=
stop
=
atoi
(
argv
[
j
]);
}
if
(
start
<
0
||
start
>=
CLUSTER_SLOTS
)
goto
fmterr
;
if
(
stop
<
0
||
stop
>=
CLUSTER_SLOTS
)
goto
fmterr
;
if
(
start
<
0
||
start
>=
CLUSTER_SLOTS
)
{
sdsfreesplitres
(
argv
,
argc
);
goto
fmterr
;
}
if
(
stop
<
0
||
stop
>=
CLUSTER_SLOTS
)
{
sdsfreesplitres
(
argv
,
argc
);
goto
fmterr
;
}
while
(
start
<=
stop
)
clusterAddSlot
(
n
,
start
++
);
}
...
...
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