Merge lp:~macslow/unity/unity-4.0.fix-834630 into lp:unity/4.0

[Mirco Müller]

Add an out-of-bounds check to the DetailXids vector. Fixes LP: #834630

[Tim Penhey (thumper)]

I think it would be slightly clearer with:
  if (detail_selection_index >= DetailXids().size())
rather than:
  if (detail_selection_index > DetailXids().size() - 1)

as normally when looping you have
  while (index < size)
and the opposite of < is >=

What do you think?

review: Approve

=== modified file 'plugins/unityshell/src/SwitcherModel.cpp'
--- plugins/unityshell/src/SwitcherModel.cpp	2011-09-19 16:36:21 +0000
+++ plugins/unityshell/src/SwitcherModel.cpp	2011-10-26 15:50:21 +0000
@@ -132,6 +132,9 @@
 {
   if (!detail_selection || DetailXids ().empty())
     return 0;
+
+  if (detail_selection_index > DetailXids().size() - 1)
+    return 0;
   
   return DetailXids()[detail_selection_index];
 }