diff options
| author | Bill Rassieur <rassb@google.com> | 2019-03-29 04:15:01 +0000 |
|---|---|---|
| committer | Bill Rassieur <rassb@google.com> | 2019-03-29 04:15:01 +0000 |
| commit | 69a24699a4e097cb714a5c52251650997a661f7f (patch) | |
| tree | 24de748bcd50dbc19bab882b77d0c5a636ae3513 | |
| parent | 58d94c547230b0074b7af73dfd040ea4b92216d5 (diff) | |
| parent | fe8c297edfb0b79ac12a0f2b4c4c3952500d808d (diff) | |
| download | platform_external_jemalloc_new-69a24699a4e097cb714a5c52251650997a661f7f.tar.gz platform_external_jemalloc_new-69a24699a4e097cb714a5c52251650997a661f7f.tar.bz2 platform_external_jemalloc_new-69a24699a4e097cb714a5c52251650997a661f7f.zip | |
Merge master@5406228 into git_qt-dev-plus-aosp.
Change-Id: I31e10da5bb3c0ee66b71a2f69c010acfaeeef6db
BUG: 129345239
| -rw-r--r-- | src/android_je_iterate.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/android_je_iterate.c b/src/android_je_iterate.c index f0a4cc3e..ca776e00 100644 --- a/src/android_je_iterate.c +++ b/src/android_je_iterate.c @@ -34,6 +34,12 @@ int je_iterate(uintptr_t base, size_t size, continue; } + if (extent_szind_get_maybe_invalid(extent) >= NSIZES) { + // Ignore this unused extent. + ptr = (uintptr_t)extent_past_get(extent); + continue; + } + szind_t szind; bool slab; rtree_szind_slab_read(tsd_tsdn(tsd), &extents_rtree, rtree_ctx, ptr, true, &szind, &slab); @@ -56,8 +62,7 @@ int je_iterate(uintptr_t base, size_t size, callback(allocated_ptr, bin_size, arg); } } - } else if (extent_state_get(extent) == extent_state_active && - extent_szind_get_maybe_invalid(extent) < NSIZES) { + } else if (extent_state_get(extent) == extent_state_active) { // Large allocation. uintptr_t base_ptr = (uintptr_t)extent_addr_get(extent); if (ptr <= base_ptr) { |