diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-01-31 21:14:58 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-31 21:14:59 (GMT) |
| commit | c54ba283fa4501cc02230424ccfd84622df49256 (patch) | |
| tree | 616ea27040da3f9b556badfa5304237c7e5325ad /sha1_file.c | |
| parent | 237bdd9ddbe52eb651787af1929d8832ce37c322 (diff) | |
| parent | abd5a0026868e4c8e59126469dd76fe078689a27 (diff) | |
| download | git-c54ba283fa4501cc02230424ccfd84622df49256.zip git-c54ba283fa4501cc02230424ccfd84622df49256.tar.gz git-c54ba283fa4501cc02230424ccfd84622df49256.tar.bz2 | |
Merge branch 'jk/clear-delta-base-cache-fix'
A crashing bug introduced in v2.11 timeframe has been found (it is
triggerable only in fast-import) and fixed.
* jk/clear-delta-base-cache-fix:
clear_delta_base_cache(): don't modify hashmap while iterating
Diffstat (limited to 'sha1_file.c')
| -rw-r--r-- | sha1_file.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sha1_file.c b/sha1_file.c index c40ef71..ec957db 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -2371,11 +2371,10 @@ static inline void release_delta_base_cache(struct delta_base_cache_entry *ent) void clear_delta_base_cache(void) { - struct hashmap_iter iter; - struct delta_base_cache_entry *entry; - for (entry = hashmap_iter_first(&delta_base_cache, &iter); - entry; - entry = hashmap_iter_next(&iter)) { + struct list_head *lru, *tmp; + list_for_each_safe(lru, tmp, &delta_base_cache_lru) { + struct delta_base_cache_entry *entry = + list_entry(lru, struct delta_base_cache_entry, lru); release_delta_base_cache(entry); } } |