undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am: release strbuf on error return in hg_patch_to_mail()

Browse Source 
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Rene Scharfe 2017-08-30 19:49:33 +02:00 committed by Junio C Hamano
parent 542627a4f7
commit b36474ff6b
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
builtin/am.c
View File

@ -881,6 +881,7 @@ static int split_mail_stgit_series(struct am_state *state, const char **paths,
static int hg_patch_to_mail(FILE *out, FILE *in, int keep_cr)
{
struct strbuf sb = STRBUF_INIT;
int rc = 0;
while (!strbuf_getline_lf(&sb, in)) {
const char *str;
@ -894,19 +895,27 @@ static int hg_patch_to_mail(FILE *out, FILE *in, int keep_cr)
errno = 0;
timestamp = parse_timestamp(str, &end, 10);
if (errno)
return error(_("invalid timestamp"));
if (errno) {
rc = error(_("invalid timestamp"));
goto exit;
}
if (!skip_prefix(end, " ", &str))
return error(_("invalid Date line"));
if (!skip_prefix(end, " ", &str)) {
rc = error(_("invalid Date line"));
goto exit;
}
errno = 0;
tz = strtol(str, &end, 10);
if (errno)
return error(_("invalid timezone offset"));
if (errno) {
rc = error(_("invalid timezone offset"));
goto exit;
}
if (*end)
return error(_("invalid Date line"));
if (*end) {
rc = error(_("invalid Date line"));
goto exit;
}
/*
* mercurial's timezone is in seconds west of UTC,
@ -931,9 +940,9 @@ static int hg_patch_to_mail(FILE *out, FILE *in, int keep_cr)
fwrite(sb.buf, 1, sb.len, out);
strbuf_reset(&sb);
}
exit:
strbuf_release(&sb);
return 0;
return rc;
}
/**