Mir

Merge lp:~alan-griffiths/mir/fix-1667645-for-0.26 into lp:~mir-team/mir/0.26-old

Proposed by Alan Griffiths on 2017-02-24
Status: Merged
Merged at revision: 4033
Proposed branch: lp:~alan-griffiths/mir/fix-1667645-for-0.26
Merge into: lp:~mir-team/mir/0.26-old
Diff against target: 25 lines (+5/-0)
2 files modified
debian/changelog (+2/-0)
src/server/scene/application_session.cpp (+3/-0)
To merge this branch: bzr merge lp:~alan-griffiths/mir/fix-1667645-for-0.26
Reviewer Review Type Date Requested Status
Daniel van Vugt Approve on 2017-02-27
Brandon Schaefer (community) 2017-02-24 Approve on 2017-02-25
Review via email: mp+318254@code.launchpad.net

Commit message

Don't dereference the end iterator in ms::ApplicationSession::surface_after() (LP: #1667645)

To post a comment you must log in.
Brandon Schaefer (brandontschaefer) wrote :

This would be good to get in

review: Approve
Daniel van Vugt (vanvugt) :
review: Approve
4033. By Alan Griffiths on 2017-02-27

Don't dereference the end iterator in ms::ApplicationSession::surface_after()
(LP: #1667645)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2017-02-23 14:16:59 +0000
3+++ debian/changelog 2017-02-24 17:23:50 +0000
4@@ -11,6 +11,8 @@
5 mir::gl::tessellate_renderable_into_rectangle() (LP: #1664760)
6 . Nested servers (Unity8) periodically stutter (half frame rate) with
7 Mir 0.26.1 (LP: #1666372)
8+ . Don't dereference the end iterator in ms::ApplicationSession::
9+ surface_after() (LP: #1667645)
10
11 -- Daniel van Vugt <daniel.van.vugt@canonical.com> Mon, 20 Feb 2017 13:37:13 +0800
12
13
14=== modified file 'src/server/scene/application_session.cpp'
15--- src/server/scene/application_session.cpp 2017-02-02 18:25:05 +0000
16+++ src/server/scene/application_session.cpp 2017-02-24 17:23:50 +0000
17@@ -235,6 +235,9 @@
18 if (next == surfaces.end())
19 next = std::find_if(begin(surfaces), current, can_take_focus);
20
21+ if (next == end(surfaces))
22+ return {};
23+
24 return next->second;
25 }
26

Subscribers

People subscribed via source and target branches