Commit 5ca2f0c4 authored by antirez's avatar antirez
Browse files

preventive conflict resolution to merge pietern/zset-mem

parent 5171777b
...@@ -355,7 +355,8 @@ void zaddGenericCommand(redisClient *c, robj *key, robj *ele, double scoreval, i ...@@ -355,7 +355,8 @@ void zaddGenericCommand(redisClient *c, robj *key, robj *ele, double scoreval, i
*score = scoreval; *score = scoreval;
} }
if (isnan(*score)) { if (isnan(*score)) {
addReplyError(c,"resulting score is not a number (NaN)"); addReplySds(c,
sdsnew("-ERR resulting score is not a number (NaN)\r\n"));
zfree(score); zfree(score);
/* Note that we don't need to check if the zset may be empty and /* Note that we don't need to check if the zset may be empty and
* should be removed here, as we can only obtain Nan as score if * should be removed here, as we can only obtain Nan as score if
......
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