aofChildWriteDiffData() better handling of free blocks.

1 files changed, 7 insertions, 4 deletions

diff --git a/src/aof.c b/src/aof.c
index 6858120c9..aa97626a1 100644
--- a/src/aof.c
+++ b/src/aof.c
@@ -104,10 +104,13 @@ void aofChildWriteDiffData(aeEventLoop *el, int fd, void *privdata, int mask) {
                               AE_WRITABLE);
             return;
         }
-        nwritten = write(server.aof_pipe_write_data_to_child,block->buf,block->used);
-        if (nwritten <= 0) return;
-        memmove(block->buf,block->buf+nwritten,block->used-nwritten);
-        block->used -= nwritten;
+        if (block->used > 0) {
+            nwritten = write(server.aof_pipe_write_data_to_child,
+                             block->buf,block->used);
+            if (nwritten <= 0) return;
+            memmove(block->buf,block->buf+nwritten,block->used-nwritten);
+            block->used -= nwritten;
+        }
         if (block->used == 0) listDelNode(server.aof_rewrite_buf_blocks,ln);
     }
 }