Merge remote-tracking branch 'origin/unstable' into aof-fixes

src/ae.c

@@ -86,6 +86,8 @@ aeEventLoop *aeCreateEventLoop(int setsize) {
 
 void aeDeleteEventLoop(aeEventLoop *eventLoop) {
     aeApiFree(eventLoop);
+    zfree(eventLoop->events);
+    zfree(eventLoop->fired);
     zfree(eventLoop);
 }
 

src/ae_epoll.c

@@ -13,7 +13,7 @@ static int aeApiCreate(aeEventLoop *eventLoop) {
     aeApiState *state = zmalloc(sizeof(aeApiState));
 
     if (!state) return -1;
-    state->events = zmalloc(sizeof(epoll_event)*eventLoop->setsize);
+    state->events = zmalloc(sizeof(struct epoll_event)*eventLoop->setsize);
     if (!state->events) {
         zfree(state);
         return -1;

src/networking.c

@@ -997,8 +997,12 @@ sds getAllClientsInfoString(void) {
 
     listRewind(server.clients,&li);
     while ((ln = listNext(&li)) != NULL) {
+        sds cs;
+
         client = listNodeValue(ln);
-        o = sdscatsds(o,getClientInfoString(client));
+        cs = getClientInfoString(client);
+        o = sdscatsds(o,cs);
+        sdsfree(cs);
         o = sdscatlen(o,"\n",1);
     }
     return o;

src/t_zset.c

@@ -76,6 +76,7 @@ zskiplistNode *zslInsert(zskiplist *zsl, double score, robj *obj) {
     unsigned int rank[ZSKIPLIST_MAXLEVEL];
     int i, level;
 
+    redisAssert(!isnan(score));
     x = zsl->header;
     for (i = zsl->level-1; i >= 0; i--) {
         /* store rank that is crossed to reach the insert position */

src/version.h

@@ -1 +1 @@
-#define REDIS_VERSION "2.9.1"
+#define REDIS_VERSION "2.9.2"

tests/test_helper.tcl

@@ -34,6 +34,7 @@ set ::all_tests {
     unit/slowlog
     unit/scripting
     unit/maxmemory
+    unit/introspection
 }
 # Index to the next test to run in the ::all_tests list.
 set ::next_test 0

tests/unit/introspection.tcl

@@ -0,0 +1,5 @@
+start_server {tags {"introspection"}} {
+    test {CLIENT LIST} {
+        r client list
+    } {*addr=*:* fd=* idle=* flags=N db=9 sub=0 psub=0 qbuf=0 obl=0 oll=0 events=r cmd=client*}
+}