Skip to content

Commit

Permalink
for_each_reflog_ent: do not leak FILE *
Browse files Browse the repository at this point in the history
The callback function can signal an early return by returning non-zero,
but the function leaked the FILE * opened on the reflog when doing so.

Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Junio C Hamano committed Jan 19, 2007
1 parent 72fe6a5 commit 2266bf2
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions refs.c
Expand Up @@ -1110,6 +1110,7 @@ int for_each_reflog_ent(const char *ref, each_reflog_ent_fn fn, void *cb_data)
const char *logfile;
FILE *logfp;
char buf[1024];
int ret = 0;

logfile = git_path("logs/%s", ref);
logfp = fopen(logfile, "r");
Expand All @@ -1119,7 +1120,7 @@ int for_each_reflog_ent(const char *ref, each_reflog_ent_fn fn, void *cb_data)
unsigned char osha1[20], nsha1[20];
char *email_end, *message;
unsigned long timestamp;
int len, ret, tz;
int len, tz;

/* old SP new SP name <email> SP time TAB msg LF */
len = strlen(buf);
Expand All @@ -1140,9 +1141,9 @@ int for_each_reflog_ent(const char *ref, each_reflog_ent_fn fn, void *cb_data)
message += 7;
ret = fn(osha1, nsha1, buf+82, timestamp, tz, message, cb_data);
if (ret)
return ret;
break;
}
fclose(logfp);
return 0;
return ret;
}

0 comments on commit 2266bf2

Please sign in to comment.