diff options
Diffstat (limited to 'CVE-2019-10192-2.patch')
| -rw-r--r-- | CVE-2019-10192-2.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/CVE-2019-10192-2.patch b/CVE-2019-10192-2.patch new file mode 100644 index 0000000..e40dbe0 --- /dev/null +++ b/CVE-2019-10192-2.patch @@ -0,0 +1,35 @@ +From e216ceaf0e099536fe3658a29dcb725d812364e0 Mon Sep 17 00:00:00 2001 +From: antirez <antirez@gmail.com> +Date: Fri, 15 Mar 2019 17:16:06 +0100 +Subject: [PATCH] HyperLogLog: handle wrong offset in the base case. + +--- + src/hyperloglog.c | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/src/hyperloglog.c b/src/hyperloglog.c +index 526510b43b9..1e7ce3dceb7 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++; |