From 1ffa5d73ed1c76d97b78f638ae4822f202a5efc2 Mon Sep 17 00:00:00 2001
From: Pieter Noordhuis <pcnoordhuis@gmail.com>
Date: Thu, 12 May 2011 15:53:38 +0200
Subject: [PATCH] Convert intset encoded set before Z*STORE

---
 src/t_zset.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/t_zset.c b/src/t_zset.c
index 0ed665f82709..962ad46223aa 100644
--- a/src/t_zset.c
+++ b/src/t_zset.c
@@ -615,6 +615,10 @@ void zunionInterGenericCommand(redisClient *c, robj *dstkey, int op) {
             if (obj->type == REDIS_ZSET) {
                 src[i].dict = ((zset*)obj->ptr)->dict;
             } else if (obj->type == REDIS_SET) {
+                if (obj->encoding == REDIS_ENCODING_INTSET)
+                    setTypeConvert(obj, REDIS_ENCODING_HT);
+
+                redisAssert(obj->encoding == REDIS_ENCODING_HT);
                 src[i].dict = (obj->ptr);
             } else {
                 zfree(src);