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

get_mail_commit_oid(): avoid resource leak

Browse Source 
When we fail to read, or parse, the file, we still want to close the file
descriptor and release the strbuf.

Reported via Coverity.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin 2017-05-04 15:55:45 +02:00 committed by Junio C Hamano
parent 4db7dbdb4a
commit 5b34ba414d
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
builtin/am.c
View File

@ -1351,19 +1351,16 @@ static int get_mail_commit_oid(struct object_id *commit_id, const char *mail)
struct strbuf sb = STRBUF_INIT; struct strbuf sb = STRBUF_INIT;
FILE *fp = xfopen(mail, "r"); FILE *fp = xfopen(mail, "r");
const char *x; const char *x;
int ret = 0;
if (strbuf_getline_lf(&sb, fp)) if (strbuf_getline_lf(&sb, fp) ||
return -1; !skip_prefix(sb.buf, "From ", &x) ||
get_oid_hex(x, commit_id) < 0)
if (!skip_prefix(sb.buf, "From ", &x)) ret = -1;
return -1;
if (get_oid_hex(x, commit_id) < 0)
return -1;
strbuf_release(&sb); strbuf_release(&sb);
fclose(fp); fclose(fp);
return 0; return ret;
} }
/** /**