Redis 2.2.111-scripting

00-RELEASENOTES

@@ -12,6 +12,14 @@ for 2.0.
 CHANGELOG
 ---------
 
+What's new in Redis 2.2.11
+==========================
+
+* Solved a never reported but possibly critical bug in the AOF and RDB
+persistence, introduced with the new version of the iterator: In very rare
+circumstances the AOF (after rerwite) or the rdb file may contain the same
+key more than one time.
+
 What's new in Redis 2.2.10
 ==========================
 

src/aof.c

@@ -348,7 +348,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;

src/rdb.c

@@ -427,7 +427,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;

src/version.h

-#define REDIS_VERSION "2.2.110"
+#define REDIS_VERSION "2.2.111"