summaryrefslogtreecommitdiff
path: root/builtin/mailsplit.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-05-29 03:34:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-05-29 03:34:44 (GMT)
commit849e671b52e11d4a2f70d577dd2c806f3ca756fe (patch)
treef564d4d2782856efcdcff278b385a989c031a6c1 /builtin/mailsplit.c
parent137a2613a07e556fd77fe374c6f4edd2d5e1b1fc (diff)
parent443a12f37be1c5967785b83bf04935fe357afb9b (diff)
downloadgit-849e671b52e11d4a2f70d577dd2c806f3ca756fe.zip
git-849e671b52e11d4a2f70d577dd2c806f3ca756fe.tar.gz
git-849e671b52e11d4a2f70d577dd2c806f3ca756fe.tar.bz2
Merge branch 'js/plug-leaks'
Fix memory leaks pointed out by Coverity (and people). * js/plug-leaks: (26 commits) checkout: fix memory leak submodule_uses_worktrees(): plug memory leak show_worktree(): plug memory leak name-rev: avoid leaking memory in the `deref` case remote: plug memory leak in match_explicit() add_reflog_for_walk: avoid memory leak shallow: avoid memory leak line-log: avoid memory leak receive-pack: plug memory leak in update() fast-export: avoid leaking memory in handle_tag() mktree: plug memory leaks reported by Coverity pack-redundant: plug memory leak setup_discovered_git_dir(): plug memory leak setup_bare_git_dir(): help static analysis split_commit_in_progress(): simplify & fix memory leak checkout: fix memory leak cat-file: fix memory leak mailinfo & mailsplit: check for EOF while parsing status: close file descriptor after reading git-rebase-todo difftool: address a couple of resource/memory leaks ...
Diffstat (limited to 'builtin/mailsplit.c')
-rw-r--r--builtin/mailsplit.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/builtin/mailsplit.c b/builtin/mailsplit.c
index 3068168..664400b 100644
--- a/builtin/mailsplit.c
+++ b/builtin/mailsplit.c
@@ -232,6 +232,16 @@ static int split_mbox(const char *file, const char *dir, int allow_bare,
do {
peek = fgetc(f);
+ if (peek == EOF) {
+ if (f == stdin)
+ /* empty stdin is OK */
+ ret = skip;
+ else {
+ fclose(f);
+ error(_("empty mbox: '%s'"), file);
+ }
+ goto out;
+ }
} while (isspace(peek));
ungetc(peek, f);