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
83b5b5a4
Unverified
Commit
83b5b5a4
authored
Mar 01, 2018
by
Salvatore Sanfilippo
Committed by
GitHub
Mar 01, 2018
Browse files
Merge pull request #4714 from charsyam/feature/fix-out-of-index-range
[BugFix] Fix out of array index range for findBigKeys in redis-cli
parents
3a5bf75e
6168d5a1
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/redis-cli.c
View file @
83b5b5a4
...
@@ -2077,6 +2077,7 @@ static void pipeMode(void) {
...
@@ -2077,6 +2077,7 @@ static void pipeMode(void) {
#define TYPE_ZSET 4
#define TYPE_ZSET 4
#define TYPE_STREAM 5
#define TYPE_STREAM 5
#define TYPE_NONE 6
#define TYPE_NONE 6
#define TYPE_MAX_KEYS TYPE_NONE
static
redisReply
*
sendScan
(
unsigned
long
long
*
it
)
{
static
redisReply
*
sendScan
(
unsigned
long
long
*
it
)
{
redisReply
*
reply
=
redisCommand
(
context
,
"SCAN %llu"
,
*
it
);
redisReply
*
reply
=
redisCommand
(
context
,
"SCAN %llu"
,
*
it
);
...
@@ -2222,9 +2223,9 @@ static void getKeySizes(redisReply *keys, int *types,
...
@@ -2222,9 +2223,9 @@ static void getKeySizes(redisReply *keys, int *types,
}
}
static
void
findBigKeys
(
void
)
{
static
void
findBigKeys
(
void
)
{
unsigned
long
long
biggest
[
5
]
=
{
0
},
counts
[
5
]
=
{
0
},
totalsize
[
5
]
=
{
0
};
unsigned
long
long
biggest
[
TYPE_MAX_KEYS
]
=
{
0
},
counts
[
TYPE_MAX_KEYS
]
=
{
0
},
totalsize
[
TYPE_MAX_KEYS
]
=
{
0
};
unsigned
long
long
sampled
=
0
,
total_keys
,
totlen
=
0
,
*
sizes
=
NULL
,
it
=
0
;
unsigned
long
long
sampled
=
0
,
total_keys
,
totlen
=
0
,
*
sizes
=
NULL
,
it
=
0
;
sds
maxkeys
[
5
]
=
{
0
};
sds
maxkeys
[
TYPE_MAX_KEYS
]
=
{
0
};
char
*
typename
[]
=
{
"string"
,
"list"
,
"set"
,
"hash"
,
"zset"
,
"stream"
};
char
*
typename
[]
=
{
"string"
,
"list"
,
"set"
,
"hash"
,
"zset"
,
"stream"
};
char
*
typeunit
[]
=
{
"bytes"
,
"items"
,
"members"
,
"fields"
,
"members"
};
char
*
typeunit
[]
=
{
"bytes"
,
"items"
,
"members"
,
"fields"
,
"members"
};
redisReply
*
reply
,
*
keys
;
redisReply
*
reply
,
*
keys
;
...
...
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