Skip to content

Commit

Permalink
diff --no-index: don't leak buffers in queue_diff
Browse files Browse the repository at this point in the history
queue_diff uses two strbufs, and at the end of the function
strbuf_reset was called.  This only reset the length of the buffer -
any allocated memory was leaked.  Using strbuf_release fixes this.

Signed-off-by: Bobby Powers <bobbypowers@gmail.com>
Reviewed-by: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
bpowers authored and gitster committed May 16, 2012
1 parent f3999e0 commit 176a335
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions diff-no-index.c
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ static int queue_diff(struct diff_options *o,
}
string_list_clear(&p1, 0);
string_list_clear(&p2, 0);
strbuf_reset(&buffer1);
strbuf_reset(&buffer2);
strbuf_release(&buffer1);
strbuf_release(&buffer2);

return ret;
} else {
Expand Down

0 comments on commit 176a335

Please sign in to comment.