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
406be0ea
Commit
406be0ea
authored
Nov 05, 2013
by
antirez
Browse files
Use strtoul() instead of sscanf() in SCAN implementation.
parent
4b615eea
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/db.c
View file @
406be0ea
...
...
@@ -354,7 +354,7 @@ void scanCallback(void *privdata, const dictEntry *de) {
void
scanGenericCommand
(
redisClient
*
c
,
robj
*
o
)
{
int
rv
;
int
i
,
j
;
char
buf
[
REDIS_LONGSTR_SIZE
];
char
buf
[
REDIS_LONGSTR_SIZE
]
,
*
eptr
;
list
*
keys
=
listCreate
();
listNode
*
node
,
*
nextnode
;
unsigned
long
cursor
=
0
;
...
...
@@ -371,9 +371,12 @@ void scanGenericCommand(redisClient *c, robj *o) {
/* Set i to the first option argument. The previous one is the cursor. */
i
=
(
o
==
NULL
)
?
2
:
3
;
/* Skip the key argument if needed. */
/* Use sscanf because we need an *unsigned* long */
rv
=
sscanf
(
c
->
argv
[
i
-
1
]
->
ptr
,
"%lu"
,
&
cursor
);
if
(
rv
!=
1
)
{
/* Use strtoul() because we need an *unsigned* long, so
* getLongLongFromObject() does not cover the whole cursor space. */
errno
=
0
;
cursor
=
strtoul
(
c
->
argv
[
i
-
1
]
->
ptr
,
&
eptr
,
10
);
if
(
isspace
(((
char
*
)
c
->
argv
[
i
-
1
])[
0
])
||
eptr
[
0
]
!=
'\0'
||
errno
==
ERANGE
)
{
addReplyError
(
c
,
"invalid cursor"
);
goto
cleanup
;
}
...
...
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