Commit bb039e85 authored by antirez's avatar antirez
Browse files

fixed a bug in rdbLoadObject abount specially encoded objects

parent a8dca69b
...@@ -4250,8 +4250,10 @@ static robj *rdbLoadObject(int type, FILE *fp) { ...@@ -4250,8 +4250,10 @@ static robj *rdbLoadObject(int type, FILE *fp) {
/* If we are using a zipmap and there are too big values /* If we are using a zipmap and there are too big values
* the object is converted to real hash table encoding. */ * the object is converted to real hash table encoding. */
if (o->encoding != REDIS_ENCODING_HT && if (o->encoding != REDIS_ENCODING_HT &&
(sdslen(key->ptr) > server.hash_max_zipmap_value || ((key->encoding == REDIS_ENCODING_RAW &&
sdslen(val->ptr) > server.hash_max_zipmap_value)) sdslen(key->ptr) > server.hash_max_zipmap_value) ||
(val->encoding == REDIS_ENCODING_RAW &&
sdslen(val->ptr) > server.hash_max_zipmap_value)))
{ {
convertToRealHash(o); convertToRealHash(o);
} }
......
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