Merge lp:~3v1n0/unity/fix-keyboardutil-crash-920258-5.0 into lp:unity/5.0

[Marco Trevisan (Treviño)]

KeyboardUtil: fix possible crash if XkbGetKeyboard returns null

Also use initializer list

Backported to 5.0 branch lp:~3v1n0/unity/fix-keyboardutil-crash-920258/+merge/113658

[Gord Allott (gordallott)]

solid code.

review: Approve

=== modified file 'plugins/unityshell/src/KeyboardUtil.cpp'
--- plugins/unityshell/src/KeyboardUtil.cpp	2012-06-28 08:49:20 +0000
+++ plugins/unityshell/src/KeyboardUtil.cpp	2012-07-05 23:01:20 +0000
@@ -25,17 +25,18 @@
 
 namespace unity {
 namespace ui {
+namespace {
+  const unsigned int FETCH_MASK = XkbGBN_KeyNamesMask | XkbGBN_ClientSymbolsMask | XkbGBN_GeometryMask;
+}
 
 KeyboardUtil::KeyboardUtil(Display *display)
   : display_(display)
-{
-  unsigned int fetch_mask = XkbGBN_KeyNamesMask | XkbGBN_ClientSymbolsMask | XkbGBN_GeometryMask;
-  keyboard_ = XkbGetKeyboard (display, fetch_mask, XkbUseCoreKbd);
-}
+  , keyboard_(XkbGetKeyboard(display_, FETCH_MASK, XkbUseCoreKbd))
+{}
 
 KeyboardUtil::~KeyboardUtil()
 {
-  XkbFreeKeyboard (keyboard_, 0, True);
+  XkbFreeKeyboard(keyboard_, 0, True);
 }
 
 bool KeyboardUtil::FindKeyInGeometry(XkbGeometryPtr geo, char *key_name, int& res_section, XkbBoundsRec& res_bounds) const
@@ -86,6 +87,9 @@
 
 guint KeyboardUtil::ConvertKeyToKeycode(XkbKeyPtr key) const
 {
+  if (!keyboard_)
+    return 0;
+
   int min_code = keyboard_->min_key_code;
   int max_code = keyboard_->max_key_code;
 
@@ -94,6 +98,7 @@
     if (!strncmp(key->name.name, keyboard_->names->keys[i].name, XkbKeyNameLength))
       return i;
   }
+
   return 0;
 }
 
@@ -186,7 +191,7 @@
 
   int code = XKeysymToKeycode(display_, key_symbol);
 
-  if (!code)
+  if (!code || !keyboard_)
     return result;
 
   if (keyboard_->min_key_code > code || keyboard_->max_key_code < code)
 
=== modified file 'plugins/unityshell/src/KeyboardUtil.h'
--- plugins/unityshell/src/KeyboardUtil.h	2012-06-28 08:49:20 +0000
+++ plugins/unityshell/src/KeyboardUtil.h	2012-07-05 23:01:20 +0000
@@ -51,8 +51,8 @@
 
   XkbBoundsRec GetAbsoluteKeyBounds (XkbKeyPtr key, XkbRowPtr row, XkbSectionPtr section, XkbGeometryPtr geo) const;
 
+  Display *display_;
   XkbDescPtr keyboard_;
-  Display *display_;
 };
 
 }