From de52cf1cdd9bc53c51990a10654feb30ceece241 Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Thu, 2 Jan 2020 20:52:49 +0100 Subject: [PATCH] core: check return value of map.metadata Even though the call of map.metadata is known to always return a valid pointer (because the meta data is assigned in the code just above), better add an explicit nullptr check. --- repos/base/src/core/region_map_component.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/repos/base/src/core/region_map_component.cc b/repos/base/src/core/region_map_component.cc index 81190f3e3..35ed1cfbc 100644 --- a/repos/base/src/core/region_map_component.cc +++ b/repos/base/src/core/region_map_component.cc @@ -445,10 +445,11 @@ Region_map_component::attach(Dataspace_capability ds_cap, size_t size, error("failed to store attachment info"); throw Invalid_dataspace(); } - Rm_region ®ion = *_map.metadata(attach_at); /* inform dataspace about attachment */ - dsc->attached_to(region); + Rm_region * const region_ptr = _map.metadata(attach_at); + if (region_ptr) + dsc->attached_to(*region_ptr); /* check if attach operation resolves any faulting region-manager clients */ _faulters.for_each([&] (Rm_faulter &faulter) {