summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorMarcin Wojtas <mw@FreeBSD.org>2020-12-18 10:09:21 +0000
committerMarcin Wojtas <mw@FreeBSD.org>2020-12-18 10:09:21 +0000
commitb62ae61446ee19ab524fea4a066f585cbd7aa727 (patch)
treeb059bd73a15f3a0f704bc34dccb3afc47dd2c405 /contrib
parent150367e9aa1c1fee46f81bcf7b30ab879a1bfa6e (diff)
Notes
Diffstat (limited to 'contrib')
-rw-r--r--contrib/jemalloc/src/extent.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/contrib/jemalloc/src/extent.c b/contrib/jemalloc/src/extent.c
index 9237f903dc3d3..b4ef382676bec 100644
--- a/contrib/jemalloc/src/extent.c
+++ b/contrib/jemalloc/src/extent.c
@@ -1641,8 +1641,11 @@ extent_try_coalesce_impl(tsdn_t *tsdn, arena_t *arena,
}
/* Try to coalesce backward. */
- extent_t *prev = extent_lock_from_addr(tsdn, rtree_ctx,
- extent_before_get(extent), inactive_only);
+ extent_t *prev = NULL;
+ if (extent_before_get(extent) != NULL) {
+ prev = extent_lock_from_addr(tsdn, rtree_ctx,
+ extent_before_get(extent), inactive_only);
+ }
if (prev != NULL) {
bool can_coalesce = extent_can_coalesce(arena, extents,
extent, prev);