Merge pull request #3239 from dvirsky/fix_hashset_crash

fixed bad transfer of ownership in HashSet causing a potential crash
This commit is contained in:
Salvatore Sanfilippo 2016-05-18 07:15:15 -07:00
commit 01a83d0a2a

View File

@ -1795,10 +1795,13 @@ int RM_HashSet(RedisModuleKey *key, int flags, ...) {
if (flags & REDISMODULE_HASH_CFIELDS)
low_flags |= HASH_SET_TAKE_FIELD;
updated += hashTypeSet(key->value, field->ptr, value->ptr, low_flags);
field->ptr = NULL; /* Ownership is now of hashTypeSet() */
/* Cleanup */
if (flags & REDISMODULE_HASH_CFIELDS) decrRefCount(field);
/* If CFIELDS is active, ownership is now of hashTypeSet() */
if (flags & REDISMODULE_HASH_CFIELDS) {
field->ptr = NULL;
/* Cleanup */
decrRefCount(field);
}
}
va_end(ap);
moduleDelKeyIfEmpty(key);