diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-03-20 01:25:37 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-03-20 01:25:37 +0300 |
| commit | 1dd4e7452295618b20703deffc4241bf7dd4be4f (patch) | |
| tree | a8390c1f3eafd563988d9c2fafe8ad680d7ecc4b /mergetools/kdiff3 | |
| parent | 35381b13da846cc6ad620f9f9a5abf1d974d6e9b (diff) | |
| parent | 4abc57848d8ace8218952c7376fa397c0850392c (diff) | |
Merge branch 'js/fsmonitor-unpack-fix'
The data structure used by fsmonitor interface was not properly
duplicated during an in-core merge, leading to use-after-free etc.
* js/fsmonitor-unpack-fix:
fsmonitor: do not forget to release the token in `discard_index()`
fsmonitor: fix memory corruption in some corner cases
Diffstat (limited to 'mergetools/kdiff3')
0 files changed, 0 insertions, 0 deletions