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
58ac57f6
Unverified
Commit
58ac57f6
authored
Nov 24, 2017
by
Salvatore Sanfilippo
Committed by
GitHub
Nov 24, 2017
Browse files
Merge pull request #4470 from oranagra/fix_string_to_double
fix string to double conversion, stopped parsing on \0 …
parents
de914ede
adf2701c
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/object.c
View file @
58ac57f6
...
...
@@ -560,7 +560,7 @@ int getDoubleFromObject(const robj *o, double *target) {
value
=
strtod
(
o
->
ptr
,
&
eptr
);
if
(
sdslen
(
o
->
ptr
)
==
0
||
isspace
(((
const
char
*
)
o
->
ptr
)[
0
])
||
eptr
[
0
]
!=
'\0'
||
(
size_t
)(
eptr
-
(
char
*
)
o
->
ptr
)
!=
sdslen
(
o
->
ptr
)
||
(
errno
==
ERANGE
&&
(
value
==
HUGE_VAL
||
value
==
-
HUGE_VAL
||
value
==
0
))
||
isnan
(
value
))
...
...
@@ -602,7 +602,7 @@ int getLongDoubleFromObject(robj *o, long double *target) {
value
=
strtold
(
o
->
ptr
,
&
eptr
);
if
(
sdslen
(
o
->
ptr
)
==
0
||
isspace
(((
const
char
*
)
o
->
ptr
)[
0
])
||
eptr
[
0
]
!=
'\0'
||
(
size_t
)(
eptr
-
(
char
*
)
o
->
ptr
)
!=
sdslen
(
o
->
ptr
)
||
(
errno
==
ERANGE
&&
(
value
==
HUGE_VAL
||
value
==
-
HUGE_VAL
||
value
==
0
))
||
isnan
(
value
))
...
...
tests/unit/type/incr.tcl
View file @
58ac57f6
...
...
@@ -144,4 +144,11 @@ start_server {tags {"incr"}} {
r set foo 1
roundFloat
[
r incrbyfloat foo -1.1
]
}
{
-0.1
}
test
{
string to double with null terminator
}
{
r set foo 1
r setrange foo 2 2
catch
{
r incrbyfloat foo 1
}
err
format $err
}
{
ERR*valid*
}
}
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