summaryrefslogtreecommitdiff
path: root/strbuf.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junio@pobox.com>2008-06-17 00:23:31 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-06-17 16:39:59 -0700
commit1a8fb155cff5b19bc41ee3ac96e34f0f2ad95763 (patch)
tree77c869be217a7ff7c67049f469aa49f513327b7b /strbuf.c
parentgitweb: remove unused parse_ref method (diff)
downloadtgif-1a8fb155cff5b19bc41ee3ac96e34f0f2ad95763.tar.xz
builtin-rerere: fix a small leak
The data read from MERGE_RR file is kept in path-list by hanging textual 40-byte conflict signature to path of the blob that contains the conflict. The signature is strdup'ed twice, and the second copy is given to the path-list, leaking the first copy. Signed-off-by: Junio C Hamano <junio@pobox.com> Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Diffstat (limited to 'strbuf.c')
0 files changed, 0 insertions, 0 deletions