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
f483ce5f
Commit
f483ce5f
authored
Jun 24, 2010
by
Pieter Noordhuis
Browse files
fix unexpected behavior on an out of range end index for LRANGE and LTRIM
parent
4774a53b
Changes
2
Show whitespace changes
Inline
Side-by-side
redis.c
View file @
f483ce5f
...
@@ -5404,9 +5404,9 @@ static void lrangeCommand(redisClient *c) {
...
@@ -5404,9 +5404,9 @@ static void lrangeCommand(redisClient *c) {
if
(
start
<
0
)
start
=
llen
+
start
;
if
(
start
<
0
)
start
=
llen
+
start
;
if
(
end
<
0
)
end
=
llen
+
end
;
if
(
end
<
0
)
end
=
llen
+
end
;
if
(
start
<
0
)
start
=
0
;
if
(
start
<
0
)
start
=
0
;
if
(
end
<
0
)
end
=
0
;
/* indexes sanity checks */
/* Invariant: start >= 0, so this test will be true when end < 0.
* The range is empty when start > end or start >= length. */
if
(
start
>
end
||
start
>=
llen
)
{
if
(
start
>
end
||
start
>=
llen
)
{
/* Out of range start or start > end result in empty list */
/* Out of range start or start > end result in empty list */
addReply
(
c
,
shared
.
emptymultibulk
);
addReply
(
c
,
shared
.
emptymultibulk
);
...
@@ -5444,9 +5444,9 @@ static void ltrimCommand(redisClient *c) {
...
@@ -5444,9 +5444,9 @@ static void ltrimCommand(redisClient *c) {
if
(
start
<
0
)
start
=
llen
+
start
;
if
(
start
<
0
)
start
=
llen
+
start
;
if
(
end
<
0
)
end
=
llen
+
end
;
if
(
end
<
0
)
end
=
llen
+
end
;
if
(
start
<
0
)
start
=
0
;
if
(
start
<
0
)
start
=
0
;
if
(
end
<
0
)
end
=
0
;
/* indexes sanity checks */
/* Invariant: start >= 0, so this test will be true when end < 0.
* The range is empty when start > end or start >= length. */
if
(
start
>
end
||
start
>=
llen
)
{
if
(
start
>
end
||
start
>=
llen
)
{
/* Out of range start or start > end result in empty list */
/* Out of range start or start > end result in empty list */
ltrim
=
llen
;
ltrim
=
llen
;
...
...
tests/unit/type/list.tcl
View file @
f483ce5f
...
@@ -340,6 +340,12 @@ start_server {
...
@@ -340,6 +340,12 @@ start_server {
create_$type mylist
{
1 2 3
}
create_$type mylist
{
1 2 3
}
assert_equal
{
1 2 3
}
[
r lrange mylist -1000 1000
]
assert_equal
{
1 2 3
}
[
r lrange mylist -1000 1000
]
}
}
test
"LRANGE out of range negative end index -
$type
"
{
create_$type mylist
{
1 2 3
}
assert_equal
{
1
}
[
r lrange mylist 0 -3
]
assert_equal
{}
[
r lrange mylist 0 -4
]
}
}
}
test
{
LRANGE against non existing key
}
{
test
{
LRANGE against non existing key
}
{
...
@@ -369,6 +375,11 @@ start_server {
...
@@ -369,6 +375,11 @@ start_server {
assert_equal
{
1 2 3 4 5
}
[
trim_list $type 0 10
]
assert_equal
{
1 2 3 4 5
}
[
trim_list $type 0 10
]
}
}
test
"LTRIM out of range negative end index -
$type
"
{
assert_equal
{
1
}
[
trim_list $type 0 -5
]
assert_equal
{}
[
trim_list $type 0 -6
]
}
tags
{
"slow"
}
{
tags
{
"slow"
}
{
test
"LTRIM stress testing -
$type
"
{
test
"LTRIM stress testing -
$type
"
{
set mylist
{}
set mylist
{}
...
...
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