fixed rebase error that caused redis to panic with BLPOP

4bbb8e6b · Jonathan Pickett · 2959371b · 4bbb8e6b
隐藏空白更改
内联并排

Showing with 1 addition and 2 deletion

src/t_list.c src/t_list.c +1 -2

未找到文件。
--- a/src/t_list.c
+++ b/src/t_list.c
@@ -838,8 +838,7 @@ void unblockClientWaitingData(redisClient *c) {
    dictReleaseIterator(di);

    /* Cleanup the client structure */
-    zfree(c->bpop.keys);
-    c->bpop.keys = NULL;
+    dictEmpty(c->bpop.keys,NULL);
    if (c->bpop.target) {
        decrRefCount(c->bpop.target);
        c->bpop.target = NULL;