summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/listpack.c4
-rw-r--r--src/ziplist.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/listpack.c b/src/listpack.c
index 7fe86d297..479ab097d 100644
--- a/src/listpack.c
+++ b/src/listpack.c
@@ -882,8 +882,10 @@ unsigned char *lpInsert(unsigned char *lp, unsigned char *elestr, unsigned char
if (!delete) {
if (enctype == LP_ENCODING_INT) {
memcpy(dst,eleint,enclen);
- } else {
+ } else if (elestr) {
lpEncodeString(dst,elestr,size);
+ } else {
+ redis_unreachable();
}
dst += enclen;
memcpy(dst,backlen,backlen_size);
diff --git a/src/ziplist.c b/src/ziplist.c
index 9fa94bf1f..c3aa65633 100644
--- a/src/ziplist.c
+++ b/src/ziplist.c
@@ -1754,7 +1754,7 @@ static void stress(int pos, int num, int maxsize, int dnum) {
static unsigned char *pop(unsigned char *zl, int where) {
unsigned char *p, *vstr;
unsigned int vlen;
- long long vlong;
+ long long vlong = 0;
p = ziplistIndex(zl,where == ZIPLIST_HEAD ? 0 : -1);
if (ziplistGet(p,&vstr,&vlen,&vlong)) {