diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-04 10:21:04 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-04 10:21:04 +0900 |
| commit | 34bbe2edd47cf22a7af361f8ec9d41c5ec95aaac (patch) | |
| tree | 2518c80fab78106a36801c02b6b2a53628fa7c82 /builtin/mailsplit.c | |
| parent | 7ba4fa5c080c3ee2ce2aaafaf469bc781c951571 (diff) | |
| parent | 443a12f37be1c5967785b83bf04935fe357afb9b (diff) | |
| download | git-34bbe2edd47cf22a7af361f8ec9d41c5ec95aaac.tar.gz | |
Merge branch 'js/plug-leaks' into maint
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.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/builtin/mailsplit.c b/builtin/mailsplit.c index 30681681c1..664400b816 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); |