global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-25 18:12:44 +00:00
Code Issues 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>
This commit is contained in:
Johannes Schindelin
2017-04-17 13:42:44 +02:00
parent 523ea055e8
commit cf05da96a3
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
builtin/am.c
View File

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