diff options
| author | antirez <antirez@gmail.com> | 2019-03-15 17:16:06 +0100 |
|---|---|---|
| committer | antirez <antirez@gmail.com> | 2019-03-18 11:31:10 +0100 |
| commit | 3c62ad193d4e12905586d6a9fcaca8e980eb76b9 (patch) | |
| tree | 148d855e17c95716308c215c417979b933135d62 | |
| parent | cc2b3a68e6604141fb99dc2d1429817bbcece56e (diff) | |
| download | redis-3c62ad193d4e12905586d6a9fcaca8e980eb76b9.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 3bc664d3e..c0f20815c 100644 --- a/src/hyperloglog.c +++ b/src/hyperloglog.c @@ -611,10 +611,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++; @@ -1085,8 +1082,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++; |