Unverified Commit 58ac57f6 authored by Salvatore Sanfilippo's avatar Salvatore Sanfilippo Committed by GitHub
Browse files

Merge pull request #4470 from oranagra/fix_string_to_double

fix string to double conversion, stopped parsing on \0 …
parents de914ede adf2701c
...@@ -560,7 +560,7 @@ int getDoubleFromObject(const robj *o, double *target) { ...@@ -560,7 +560,7 @@ int getDoubleFromObject(const robj *o, double *target) {
value = strtod(o->ptr, &eptr); value = strtod(o->ptr, &eptr);
if (sdslen(o->ptr) == 0 || if (sdslen(o->ptr) == 0 ||
isspace(((const char*)o->ptr)[0]) || isspace(((const char*)o->ptr)[0]) ||
eptr[0] != '\0' || (size_t)(eptr-(char*)o->ptr) != sdslen(o->ptr) ||
(errno == ERANGE && (errno == ERANGE &&
(value == HUGE_VAL || value == -HUGE_VAL || value == 0)) || (value == HUGE_VAL || value == -HUGE_VAL || value == 0)) ||
isnan(value)) isnan(value))
...@@ -602,7 +602,7 @@ int getLongDoubleFromObject(robj *o, long double *target) { ...@@ -602,7 +602,7 @@ int getLongDoubleFromObject(robj *o, long double *target) {
value = strtold(o->ptr, &eptr); value = strtold(o->ptr, &eptr);
if (sdslen(o->ptr) == 0 || if (sdslen(o->ptr) == 0 ||
isspace(((const char*)o->ptr)[0]) || isspace(((const char*)o->ptr)[0]) ||
eptr[0] != '\0' || (size_t)(eptr-(char*)o->ptr) != sdslen(o->ptr) ||
(errno == ERANGE && (errno == ERANGE &&
(value == HUGE_VAL || value == -HUGE_VAL || value == 0)) || (value == HUGE_VAL || value == -HUGE_VAL || value == 0)) ||
isnan(value)) isnan(value))
......
...@@ -144,4 +144,11 @@ start_server {tags {"incr"}} { ...@@ -144,4 +144,11 @@ start_server {tags {"incr"}} {
r set foo 1 r set foo 1
roundFloat [r incrbyfloat foo -1.1] roundFloat [r incrbyfloat foo -1.1]
} {-0.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*}
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment