[PATCH 02/67] mailsplit: fix FILE* leak in split_maildir

[Jeff King]

If we encounter an error while splitting a maildir, we exit
the function early, leaking the open filehandle. This isn't
a big deal, since we exit the program soon after, but it's
easy enough to be careful.

Signed-off-by: Jeff King <p...@peff.net>
---
 builtin/mailsplit.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/builtin/mailsplit.c b/builtin/mailsplit.c
index 8e02ea1..9de06e3 100644
--- a/builtin/mailsplit.c
+++ b/builtin/mailsplit.c
@@ -150,6 +150,7 @@ static int split_maildir(const char *maildir, const char 
*dir,
 {
        char file[PATH_MAX];
        char name[PATH_MAX];
+       FILE *f = NULL;
        int ret = -1;
        int i;
        struct string_list list = STRING_LIST_INIT_DUP;
@@ -160,7 +161,6 @@ static int split_maildir(const char *maildir, const char 
*dir,
                goto out;
 
        for (i = 0; i < list.nr; i++) {
-               FILE *f;
                snprintf(file, sizeof(file), "%s/%s", maildir, 
list.items[i].string);
                f = fopen(file, "r");
                if (!f) {
@@ -177,10 +177,13 @@ static int split_maildir(const char *maildir, const char 
*dir,
                split_one(f, name, 1);
 
                fclose(f);
+               f = NULL;
        }
 
        ret = skip;
 out:
+       if (f)
+               fclose(f);
        string_list_clear(&list, 1);
        return ret;
 }
-- 
2.6.0.rc2.408.ga2926b9

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html