alex/genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

core: avoid null pointer reference warning

Browse Source 
Issue #3022
This commit is contained in:
Alexander Boettcher
2018-10-30 08:52:43 +01:00
committed by Norman Feske
parent 8db02b0a39
commit 7536b665f1
15 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
repos/base-sel4/src/core/capability_space.cc
View File

@@ -113,7 +113,7 @@ Capability_space::create_rpc_obj_cap(Native_capability ep_cap,
ASSERT(ret == seL4_NoError);
}
return Native_capability(data);
return Native_capability(&data);
}
@@ -132,7 +132,7 @@ Native_capability Capability_space::create_ep_cap(Thread &ep_thread)
local_capability_space().create_capability(ep_sel, pd_session,
Rpc_obj_key());
return Native_capability(data);
return Native_capability(&data);
}
@@ -164,7 +164,7 @@ Native_capability Capability_space::lookup(Rpc_obj_key rpc_obj_key)
{
Native_capability::Data *data = local_capability_space().lookup(rpc_obj_key);
return data ? Native_capability(*data) : Native_capability();
return data ? Native_capability(data) : Native_capability();
}
@@ -189,7 +189,7 @@ Native_capability Capability_space::import(Ipc_cap_data ipc_cap_data)
local_capability_space().create_capability(ipc_cap_data.sel, pd_session,
ipc_cap_data.rpc_obj_key);
return Native_capability(data);
return Native_capability(&data);
}
@@ -202,5 +202,5 @@ Capability_space::create_notification_cap(Cap_sel &notify_cap)
local_capability_space().create_capability(notify_cap, pd_session,
Rpc_obj_key());
return Native_capability(data);
return Native_capability(&data);
}

13
repos/base-sel4/src/lib/base/capability_space.cc
View File

@@ -97,9 +97,8 @@ Native_capability Capability_space::create_ep_cap(Thread &ep_thread)
{
Cap_sel const ep_sel = Cap_sel(ep_thread.native_thread().ep_sel);
Native_capability::Data &data =
local_capability_space().create_capability(ep_sel, Rpc_obj_key());
Native_capability::Data *data =
&local_capability_space().create_capability(ep_sel, Rpc_obj_key());
return Native_capability(data);
}
@@ -138,7 +137,7 @@ Native_capability Capability_space::lookup(Rpc_obj_key rpc_obj_key)
{
Native_capability::Data *data = local_capability_space().lookup(rpc_obj_key);
return data ? Native_capability(*data) : Native_capability();
return data ? Native_capability(data) : Native_capability();
}
@@ -162,9 +161,9 @@ void Capability_space::reset_sel(unsigned sel)
Native_capability Capability_space::import(Ipc_cap_data ipc_cap_data)
{
Native_capability::Data &data =
local_capability_space().create_capability(ipc_cap_data.sel,
ipc_cap_data.rpc_obj_key);
Native_capability::Data *data =
&local_capability_space().create_capability(ipc_cap_data.sel,
ipc_cap_data.rpc_obj_key);
return Native_capability(data);
}