diff options
| author | Jeff King <peff@peff.net> | 2016-09-12 12:46:17 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-12 12:09:41 -0700 |
| commit | 4b92bae7d363adfe923337f198f9c98dc1c68e27 (patch) | |
| tree | e6ba67e050ccd65e8baf5ffcfa6b08c0ee7c4bbb /sha1_file.c | |
| parent | c7df68cbca75232f7843a7d70c58a0e98decef91 (diff) | |
| download | git-4b92bae7d363adfe923337f198f9c98dc1c68e27.tar.gz | |
add_delta_base_cache: use list_for_each_safejk/delta-base-cache
We may remove elements from the list while we are iterating,
which requires using a second temporary pointer. Otherwise
stepping to the next element of the list might involve
looking at freed memory (which generally works in practice,
as we _just_ freed it, but of course is wrong to rely on;
valgrind notices it).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1_file.c')
| -rw-r--r-- | sha1_file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sha1_file.c b/sha1_file.c index a57b71d133..132c861fdb 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -2187,11 +2187,11 @@ static void add_delta_base_cache(struct packed_git *p, off_t base_offset, void *base, unsigned long base_size, enum object_type type) { struct delta_base_cache_entry *ent = xmalloc(sizeof(*ent)); - struct list_head *lru; + struct list_head *lru, *tmp; delta_base_cached += base_size; - list_for_each(lru, &delta_base_cache_lru) { + list_for_each_safe(lru, tmp, &delta_base_cache_lru) { struct delta_base_cache_entry *f = list_entry(lru, struct delta_base_cache_entry, lru); if (delta_base_cached <= delta_base_cache_limit) |