diff options
| author | antirez <antirez@gmail.com> | 2019-03-15 17:16:06 +0100 |
|---|---|---|
| committer | antirez <antirez@gmail.com> | 2019-03-18 11:25:57 +0100 |
| commit | ef1833b3f9d02261617b757fd6ebe0ec3f1be507 (patch) | |
| tree | ae220c022f751ef0755b52a577d6ef23336cd22c | |
| parent | 623afd5e4bdad16edfa1300506fdf7f26c471d64 (diff) | |
| download | redis-ef1833b3f9d02261617b757fd6ebe0ec3f1be507.tar.gz | |
HyperLogLog: handle wrong offset in the base case.
| -rw-r--r-- | src/hyperloglog.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/hyperloglog.c b/src/hyperloglog.c index f9d3bc0d7..07481e9a8 100644 --- a/src/hyperloglog.c +++ b/src/hyperloglog.c @@ -614,10 +614,7 @@ 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; - } + if ((runlen + idx) > HLL_REGISTERS) break; /* Overflow. */ while(runlen--) { HLL_DENSE_SET_REGISTER(hdr->registers,idx,regval); idx++; @@ -1097,8 +1094,7 @@ 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; + if ((runlen + i) > HLL_REGISTERS) break; /* Overflow. */ while(runlen--) { if (regval > max[i]) max[i] = regval; i++; |