interpret_nth_last_branch(): plug small memleak

Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Junio C Hamano 2009-01-19 21:58:31 -08:00
parent c829774c30
commit 39765e5941
1 changed files with 7 additions and 3 deletions

View File

@ -754,7 +754,7 @@ static int grab_nth_branch_switch(unsigned char *osha1, unsigned char *nsha1,
int interpret_nth_last_branch(const char *name, struct strbuf *buf) int interpret_nth_last_branch(const char *name, struct strbuf *buf)
{ {
long nth; long nth;
int i; int i, retval;
struct grab_nth_branch_switch_cbdata cb; struct grab_nth_branch_switch_cbdata cb;
const char *brace; const char *brace;
char *num_end; char *num_end;
@ -774,17 +774,21 @@ int interpret_nth_last_branch(const char *name, struct strbuf *buf)
for (i = 0; i < nth; i++) for (i = 0; i < nth; i++)
strbuf_init(&cb.buf[i], 20); strbuf_init(&cb.buf[i], 20);
cb.cnt = 0; cb.cnt = 0;
retval = 0;
for_each_reflog_ent("HEAD", grab_nth_branch_switch, &cb); for_each_reflog_ent("HEAD", grab_nth_branch_switch, &cb);
if (cb.cnt < nth) if (cb.cnt < nth)
return 0; goto release_return;
i = cb.cnt % nth; i = cb.cnt % nth;
strbuf_reset(buf); strbuf_reset(buf);
strbuf_add(buf, cb.buf[i].buf, cb.buf[i].len); strbuf_add(buf, cb.buf[i].buf, cb.buf[i].len);
retval = brace-name+1;

release_return:
for (i = 0; i < nth; i++) for (i = 0; i < nth; i++)
strbuf_release(&cb.buf[i]); strbuf_release(&cb.buf[i]);
free(cb.buf); free(cb.buf);


return brace-name+1; return retval;
} }


/* /*