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
64324901
Commit
64324901
authored
Nov 16, 2018
by
yongman
Browse files
Fix pointer access and memory leak in redis-cli.
parent
7721fe83
Changes
1
Show whitespace changes
Inline
Side-by-side
src/redis-cli.c
View file @
64324901
...
@@ -2829,7 +2829,7 @@ static int clusterManagerMigrateKeysInSlot(clusterManagerNode *source,
...
@@ -2829,7 +2829,7 @@ static int clusterManagerMigrateKeysInSlot(clusterManagerNode *source,
if (err != NULL) {
if (err != NULL) {
*err = zmalloc((reply->len + 1) * sizeof(char));
*err = zmalloc((reply->len + 1) * sizeof(char));
strcpy(*err, reply->str);
strcpy(*err, reply->str);
CLUSTER_MANAGER_PRINT_REPLY_ERROR(source, err);
CLUSTER_MANAGER_PRINT_REPLY_ERROR(source,
*
err);
}
}
goto next;
goto next;
}
}
...
@@ -2947,7 +2947,7 @@ static int clusterManagerMoveSlot(clusterManagerNode *source,
...
@@ -2947,7 +2947,7 @@ static int clusterManagerMoveSlot(clusterManagerNode *source,
if (err != NULL) {
if (err != NULL) {
*err = zmalloc((r->len + 1) * sizeof(char));
*err = zmalloc((r->len + 1) * sizeof(char));
strcpy(*err, r->str);
strcpy(*err, r->str);
CLUSTER_MANAGER_PRINT_REPLY_ERROR(n, err);
CLUSTER_MANAGER_PRINT_REPLY_ERROR(n,
*
err);
}
}
}
}
freeReplyObject(r);
freeReplyObject(r);
...
@@ -5196,10 +5196,13 @@ static int clusterManagerCommandSetTimeout(int argc, char **argv) {
...
@@ -5196,10 +5196,13 @@ static int clusterManagerCommandSetTimeout(int argc, char **argv) {
n->port);
n->port);
ok_count++;
ok_count++;
continue;
continue;
reply_err:
reply_err:;
int need_free = 0;
if (err == NULL) err = "";
if (err == NULL) err = "";
else need_free = 1;
clusterManagerLogErr("ERR setting node-timeot for %s:%d: %s\n", n->ip,
clusterManagerLogErr("ERR setting node-timeot for %s:%d: %s\n", n->ip,
n->port, err);
n->port, err);
if (need_free) zfree(err);
err_count++;
err_count++;
}
}
clusterManagerLogInfo(">>> New node timeout set. %d OK, %d ERR.\n",
clusterManagerLogInfo(">>> New node timeout set. %d OK, %d ERR.\n",
...
...
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