Commit d270d7b7 authored by Jeff King's avatar Jeff King Committed by Junio C Hamano

mailsplit: fix FILE* leak in split_maildir

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: default avatarJeff King <[email protected]>
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent 7cd17e80
......@@ -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;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment