Commit ef1833b3 authored by antirez's avatar antirez
Browse files

HyperLogLog: handle wrong offset in the base case.

parent 623afd5e
...@@ -614,10 +614,7 @@ int hllSparseToDense(robj *o) { ...@@ -614,10 +614,7 @@ int hllSparseToDense(robj *o) {
} else { } else {
runlen = HLL_SPARSE_VAL_LEN(p); runlen = HLL_SPARSE_VAL_LEN(p);
regval = HLL_SPARSE_VAL_VALUE(p); regval = HLL_SPARSE_VAL_VALUE(p);
if ((runlen + idx) > HLL_REGISTERS) { if ((runlen + idx) > HLL_REGISTERS) break; /* Overflow. */
sdsfree(dense);
return C_ERR;
}
while(runlen--) { while(runlen--) {
HLL_DENSE_SET_REGISTER(hdr->registers,idx,regval); HLL_DENSE_SET_REGISTER(hdr->registers,idx,regval);
idx++; idx++;
...@@ -1097,8 +1094,7 @@ int hllMerge(uint8_t *max, robj *hll) { ...@@ -1097,8 +1094,7 @@ int hllMerge(uint8_t *max, robj *hll) {
} else { } else {
runlen = HLL_SPARSE_VAL_LEN(p); runlen = HLL_SPARSE_VAL_LEN(p);
regval = HLL_SPARSE_VAL_VALUE(p); regval = HLL_SPARSE_VAL_VALUE(p);
if ((runlen + i) > HLL_REGISTERS) if ((runlen + i) > HLL_REGISTERS) break; /* Overflow. */
return C_ERR;
while(runlen--) { while(runlen--) {
if (regval > max[i]) max[i] = regval; if (regval > max[i]) max[i] = regval;
i++; i++;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment