ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-06-18 07:08:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Nitpicker: avoid potential dangling pointer

Browse Source
This commit is contained in:
Norman Feske
2013-01-15 09:00:34 +01:00
parent 7b11075264
commit 2dba94eba9
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
os/src/server/nitpicker/common/view_stack.cc
View File

@ -305,15 +305,23 @@ View *View_stack::find_view(Point p)
void View_stack::remove_view(View *view) void View_stack::remove_view(View *view)
{ {
/* reset focused view if necessary */
_mode->forget(view);
/* remember geometry of view to remove */ /* remember geometry of view to remove */
Rect rect = _outline(view); Rect rect = _outline(view);
/* exclude view from view stack */ /* exclude view from view stack */
_views.remove(view); _views.remove(view);
/*
* Reset focused and pointed-at view if necessary
*
* Thus must be done after calling '_views.remove' because the new focused
* pointer is determined by traversing the view stack. If the to-be-removed
* view would still be there, we would re-assign the old pointed-to view as
* the current one, resulting in a dangling pointer right after the view
* gets destructed by the caller of 'removed_view'.
*/
_mode->forget(view);
/* redraw area where the view was visible */ /* redraw area where the view was visible */
draw_rec(_first_view(), 0, 0, rect); draw_rec(_first_view(), 0, 0, rect);
} }