diff options
| author | Matthias Andree <matthias.andree@gmx.de> | 2009-07-24 10:17:13 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-07-24 09:12:26 -0700 |
| commit | 96d69b554325b6caa323428e64fba62ca033310d (patch) | |
| tree | 2b2b26319cbf7d99a6155ae310b32f3d472c9d80 | |
| parent | 7e9ff00bbe1f437ff492a714758a4f7360feb22b (diff) | |
| download | git-96d69b554325b6caa323428e64fba62ca033310d.tar.gz git-96d69b554325b6caa323428e64fba62ca033310d.tar.xz | |
Fix export_marks() error handling.
- Don't leak one FILE * on error per export_marks() call. Found with
cppcheck and reported by Martin Ettl.
- Abort the potentially long for(;idnums.size;) loop on write errors.
- Record error if fprintf() fails for reasons not required to set the
stream error indicator, such as ENOMEM.
- Add a trailing full-stop to error message when fopen() fails.
Signed-off-by: Matthias Andree <matthias.andree@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin-fast-export.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/builtin-fast-export.c b/builtin-fast-export.c index 673171322..9091481fd 100644 --- a/builtin-fast-export.c +++ b/builtin-fast-export.c @@ -428,21 +428,27 @@ static void export_marks(char *file) uint32_t mark; struct object_decoration *deco = idnums.hash; FILE *f; + int e = 0; f = fopen(file, "w"); if (!f) - error("Unable to open marks file %s for writing", file); + error("Unable to open marks file %s for writing.", file); for (i = 0; i < idnums.size; i++) { if (deco->base && deco->base->type == 1) { mark = ptr_to_mark(deco->decoration); - fprintf(f, ":%"PRIu32" %s\n", mark, - sha1_to_hex(deco->base->sha1)); + if (fprintf(f, ":%"PRIu32" %s\n", mark, + sha1_to_hex(deco->base->sha1)) < 0) { + e = 1; + break; + } } deco++; } - if (ferror(f) || fclose(f)) + e |= ferror(f); + e |= fclose(f); + if (e) error("Unable to write marks file %s.", file); } |