aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2018-11-29 08:11:41 -0800
committerandroid-build-merger <android-build-merger@google.com>2018-11-29 08:11:41 -0800
commit0e041228dff5c121af4db4c94f56f905420e3d7b (patch)
tree55679a39b4ab9eb0c35d92fcf2eafca74f2f2835
parentbc4a947c12879e3c7e233bbfe41394cb8be2917e (diff)
parentbbdecd75a8ba53a58c4a97b818f0b82e7ac60e82 (diff)
downloadplatform_external_jemalloc_new-0e041228dff5c121af4db4c94f56f905420e3d7b.tar.gz
platform_external_jemalloc_new-0e041228dff5c121af4db4c94f56f905420e3d7b.tar.bz2
platform_external_jemalloc_new-0e041228dff5c121af4db4c94f56f905420e3d7b.zip
Ignore extents that are not associated with a size. am: 13715ae41a am: cd4da0a323
am: bbdecd75a8 Change-Id: I9f6cb4246e3acd1bf581df3904614ba79f374061
-rw-r--r--src/android_je_iterate.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/android_je_iterate.c b/src/android_je_iterate.c
index 0702f338..f0a4cc3e 100644
--- a/src/android_je_iterate.c
+++ b/src/android_je_iterate.c
@@ -56,7 +56,8 @@ int je_iterate(uintptr_t base, size_t size,
callback(allocated_ptr, bin_size, arg);
}
}
- } else if (extent_state_get(extent) == extent_state_active) {
+ } else if (extent_state_get(extent) == extent_state_active &&
+ extent_szind_get_maybe_invalid(extent) < NSIZES) {
// Large allocation.
uintptr_t base_ptr = (uintptr_t)extent_addr_get(extent);
if (ptr <= base_ptr) {