diff options
| author | Bobby Powers <bobbypowers@gmail.com> | 2012-05-16 10:50:31 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-16 11:18:06 -0700 |
| commit | 176a33542eddc6e319bfef4ca726813ce0b9af55 (patch) | |
| tree | 1ee4eec4f0a849c6181c5082e2f2dc88c8ba616b | |
| parent | f3999e03274df6b98a98a32912f5e171d6eea35f (diff) | |
| download | git-176a33542eddc6e319bfef4ca726813ce0b9af55.tar.gz | |
diff --no-index: don't leak buffers in queue_diff
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>
| -rw-r--r-- | diff-no-index.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/diff-no-index.c b/diff-no-index.c index 3080b663bc..f0b0010aed 100644 --- a/diff-no-index.c +++ b/diff-no-index.c @@ -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 { |