Use a safe iterator while saving the DB, since the getExpire() function will access...

diff --git a/src/aof.c b/src/aof.c
index 030972699445f5187694f017e932117b975b1d5f..dbd0468d89b81930a44480c9801fde7ed65bb986 100644 (file)
--- a/src/aof.c
+++ b/src/aof.c
@@ -342,7 +342,7 @@ int rewriteAppendOnlyFile(char *filename) {
         redisDb *db = server.db+j;
         dict *d = db->dict;
         if (dictSize(d) == 0) continue;
-        di = dictGetIterator(d);
+        di = dictGetSafeIterator(d);
         if (!di) {
             fclose(fp);
             return REDIS_ERR;

diff --git a/src/rdb.c b/src/rdb.c
index a2471aef63da2a78efe830574a2f4fdf30c8fce4..f98d85798c69a5064f03f10c0b3ff2d64f633009 100644 (file)
--- a/src/rdb.c
+++ b/src/rdb.c
@@ -430,7 +430,7 @@ int rdbSave(char *filename) {
         redisDb *db = server.db+j;
         dict *d = db->dict;
         if (dictSize(d) == 0) continue;
-        di = dictGetIterator(d);
+        di = dictGetSafeIterator(d);
         if (!di) {
             fclose(fp);
             return REDIS_ERR;