diff options
| author | antirez <antirez@gmail.com> | 2019-03-15 17:16:06 +0100 |
|---|---|---|
| committer | antirez <antirez@gmail.com> | 2019-03-18 11:31:38 +0100 |
| commit | 635119ded15261cc12d53feb6b323dcb9337914f (patch) | |
| tree | 84bc0209554eebd11b7a5ec4d5ece51b158a8b72 | |
| parent | f11666847ab65a9da62dc2b8716bd36efdc5eb68 (diff) | |
| download | redis-635119ded15261cc12d53feb6b323dcb9337914f.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 b3062a33f..293e73940 100644 --- a/src/hyperloglog.c +++ b/src/hyperloglog.c @@ -598,10 +598,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++; @@ -1074,8 +1071,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++; |