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

[Alan Griffiths]

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

[Brandon Schaefer (brandontschaefer)]

This would be good to get in

review: Approve

[Daniel van Vugt (vanvugt)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2017-02-23 14:16:59 +0000
+++ debian/changelog	2017-02-24 17:23:50 +0000
@@ -11,6 +11,8 @@
         mir::gl::tessellate_renderable_into_rectangle() (LP: #1664760)
       . Nested servers (Unity8) periodically stutter (half frame rate) with
         Mir 0.26.1 (LP: #1666372)
+      . Don't dereference the end iterator in ms::ApplicationSession::
+        surface_after() (LP: #1667645)
 
  -- Daniel van Vugt <[e-mail]>  Mon, 20 Feb 2017 13:37:13 +0800
 

=== modified file 'src/server/scene/application_session.cpp'
--- src/server/scene/application_session.cpp	2017-02-02 18:25:05 +0000
+++ src/server/scene/application_session.cpp	2017-02-24 17:23:50 +0000
@@ -235,6 +235,9 @@
     if (next == surfaces.end())
         next = std::find_if(begin(surfaces), current, can_take_focus);
 
+    if (next == end(surfaces))
+        return {};
+
     return next->second;
 }