diff options
| author |  Patrick Steinhardt <ps@pks.im> | 2016-02-23 12:59:17 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-02-23 12:58:26 -0800 |
| commit | 4867f1184c943f7738bb7b42cab2e62cf16cdb18 (patch) | |
| tree | 170a9a156b6e224cfa133f7182363e02b44f0f14 /Documentation/RelNotes/2.6.4.txt | |
| parent | Git 2.6.5 (diff) | |
| download | tgif-4867f1184c943f7738bb7b42cab2e62cf16cdb18.tar.xz | |
xdiff/xmerge: fix memory leak in xdl_merge
When building the script for the second file that is to be merged
we have already allocated memory for data structures related to
the first file. When we encounter an error in building the second
script we only free allocated memory related to the second file
before erroring out.
Fix this memory leak by also releasing allocated memory related
to the first file.
Helped-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/RelNotes/2.6.4.txt')
0 files changed, 0 insertions, 0 deletions