From 8521cde570f574006ee36a2d3e0ed1b2f6953d2f Mon Sep 17 00:00:00 2001
From: Dvir Volk <dvirsky@gmail.com>
Date: Wed, 30 Nov 2016 11:49:49 +0200
Subject: [PATCH 1/3] fix memory corruption on RM_FreeCallReply

---
 src/module.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/module.c b/src/module.c
index 07f88eff..08b653e1 100644
--- a/src/module.c
+++ b/src/module.c
@@ -2286,8 +2286,10 @@ void RM_FreeCallReply_Rec(RedisModuleCallReply *reply, int freenested){
  * to have the first level function to return on nested replies, but only
  * if called by the module API. */
 void RM_FreeCallReply(RedisModuleCallReply *reply) {
+
+    RedisModuleCtx *ctx = reply->ctx;
     RM_FreeCallReply_Rec(reply,0);
-    autoMemoryFreed(reply->ctx,REDISMODULE_AM_REPLY,reply);
+    autoMemoryFreed(ctx,REDISMODULE_AM_REPLY,reply);
 }
 
 /* Return the reply type. */

From 5f5b4f1508e001ec42968fd0f94ea3e9e9e60fc9 Mon Sep 17 00:00:00 2001
From: Yossi Gottlieb <yossigo@gmail.com>
Date: Wed, 30 Nov 2016 22:05:59 +0200
Subject: [PATCH 2/3] Fix typo in RedisModuleTypeMethods declaration.

---
 src/redismodule.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/redismodule.h b/src/redismodule.h
index 4ecf3c8f..186e284c 100644
--- a/src/redismodule.h
+++ b/src/redismodule.h
@@ -102,7 +102,7 @@ typedef struct RedisModuleTypeMethods {
     RedisModuleTypeSaveFunc rdb_save;
     RedisModuleTypeRewriteFunc aof_rewrite;
     RedisModuleTypeMemUsageFunc mem_usage;
-    RedisModuleTypeRewriteFunc digest;
+    RedisModuleTypeDigestFunc digest;
     RedisModuleTypeFreeFunc free;
 } RedisModuleTypeMethods;
 

From 6eb0c52d4c9f56561eec76db64190f720661efe6 Mon Sep 17 00:00:00 2001
From: Chris Lamb <chris@chris-lamb.co.uk>
Date: Thu, 1 Dec 2016 12:10:14 +0000
Subject: [PATCH 3/3] src/rdb.c: Correct "whenver" -> "whenever" typo.

---
 src/rdb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rdb.c b/src/rdb.c
index 765e1337..b81d0808 100644
--- a/src/rdb.c
+++ b/src/rdb.c
@@ -1939,7 +1939,7 @@ void bgsaveCommand(client *c) {
         } else {
             addReplyError(c,
                 "An AOF log rewriting in progress: can't BGSAVE right now. "
-                "Use BGSAVE SCHEDULE in order to schedule a BGSAVE whenver "
+                "Use BGSAVE SCHEDULE in order to schedule a BGSAVE whenever "
                 "possible.");
         }
     } else if (rdbSaveBackground(server.rdb_filename,NULL) == C_OK) {