From a63773fae521c9b831e50226850f5af2a9bc3e90 Mon Sep 17 00:00:00 2001
From: antirez <antirez@gmail.com>
Date: Fri, 4 Mar 2011 16:24:30 +0100
Subject: AOF file descriptor leak fix backported from 2.2

---
 redis.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/redis.c b/redis.c
index d1685da6a..9037e23c8 100644
--- a/redis.c
+++ b/redis.c
@@ -8418,8 +8418,10 @@ int loadAppendOnlyFile(char *filename) {
     struct redis_stat sb;
     int appendonly = server.appendonly;
 
-    if (redis_fstat(fileno(fp),&sb) != -1 && sb.st_size == 0)
+    if (fp && redis_fstat(fileno(fp),&sb) != -1 && sb.st_size == 0) {
+        fclose(fp);
         return REDIS_ERR;
+    }
 
     if (fp == NULL) {
         redisLog(REDIS_WARNING,"Fatal error: can't open the append log file for reading: %s",strerror(errno));
-- 
cgit v1.2.1