| commit | 1a8fb155cff5b19bc41ee3ac96e34f0f2ad95763 | |
| author | Junio C Hamano <junio@pobox.com> | |
| Tue, 17 Jun 2008 07:23:31 +0000 (17 00:23 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 17 Jun 2008 23:39:59 +0000 (17 16:39 -0700) | ||
| tree | 77c869be217a7ff7c67049f469aa49f513327b7b | treesnapshot (tar.gz zip) |
| parent | 61fb0b75d138032c7600fe86640897b900f2fd4f | commitdiff |
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>
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 | diffblobblamehistory |