projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 61fb0b7) | patch
builtin-rerere: fix a small leak
authorJunio C Hamano <junio@pobox.com>
Tue, 17 Jun 2008 07:23:31 +0000 (00:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Jun 2008 23:39:59 +0000 (16:39 -0700)
commit1a8fb155cff5b19bc41ee3ac96e34f0f2ad95763
tree77c869be217a7ff7c67049f469aa49f513327b7btree | snapshot
parent61fb0b75d138032c7600fe86640897b900f2fd4fcommit | diff
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>
builtin-rerere.c diff | blob | history
Git—the stupid content tracker