From 27ae2caae756220d88014efcc3e127fd76a59423 Mon Sep 17 00:00:00 2001
From: Israel Lot <israel.lot@gmail.com>
Date: Wed, 1 May 2019 12:11:05 -0400
Subject: [PATCH] Fix hyperloglog corruption

---
 src/hyperloglog.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/hyperloglog.c b/src/hyperloglog.c
index 7365a172..39f706ed 100644
--- a/src/hyperloglog.c
+++ b/src/hyperloglog.c
@@ -611,6 +611,10 @@ int hllSparseToDense(robj *o) {
         } else {
             runlen = HLL_SPARSE_VAL_LEN(p);
             regval = HLL_SPARSE_VAL_VALUE(p);
+			if ((runlen + idx) > HLL_REGISTERS) {
+				sdsfree(dense);
+				return C_ERR;
+			}
             while(runlen--) {
                 HLL_DENSE_SET_REGISTER(hdr->registers,idx,regval);
                 idx++;
@@ -1081,6 +1085,8 @@ int hllMerge(uint8_t *max, robj *hll) {
             } else {
                 runlen = HLL_SPARSE_VAL_LEN(p);
                 regval = HLL_SPARSE_VAL_VALUE(p);
+				if ((runlen + i) > HLL_REGISTERS)
+					return C_ERR;
                 while(runlen--) {
                     if (regval > max[i]) max[i] = (uint8_t)regval;              WIN_PORT_FIX /* cast (uint8_t) */
                     i++;