Merge lp:~macslow/unity/unity.fix-850623 into lp:unity

[Mirco Müller]

_root_instance was never checked for NULL... not in unity and not in geis. Now it's at least checked in unity... should fix LP: #850623 (probably also LP: #849611)

[Gord Allott (gordallott)]

On 25/10/11 15:27, Mirco Müller wrote:
> Mirco Müller has proposed merging lp:~macslow/unity/unity.fix-850623 into lp:unity.
>
> Requested reviews:
> Unity Team (unity-team)
>
> For more details, see:
> https://code.launchpad.net/~macslow/unity/unity.fix-850623/+merge/80377
>
> _root_instance was never checked for NULL... not in unity and not in geis. Now it's at least checked in unity... should fix LP: #850623 (probably also LP: #849611)

looks good to me, approving

 +1
 merge approved

--
Gordon Allott
Canonical Ltd.
27 Floor, Millbank Tower
London SW1P 4QP
www.canonical.com

review: Approve

=== modified file 'plugins/unityshell/src/GeisAdapter.cpp'
--- plugins/unityshell/src/GeisAdapter.cpp	2011-09-26 11:58:50 +0000
+++ plugins/unityshell/src/GeisAdapter.cpp	2011-10-25 19:26:23 +0000
@@ -45,9 +45,10 @@
 GeisAdapter::Run()
 {
   int fd = -1;
-  GeisStatus status;
+  GeisStatus status = GEIS_STATUS_NOT_SUPPORTED;
 
-  status = geis_configuration_get_value(_root_instance, GEIS_CONFIG_UNIX_FD, &fd);
+  if (_root_instance != nullptr)
+    status = geis_configuration_get_value(_root_instance, GEIS_CONFIG_UNIX_FD, &fd);
 
   if (status != GEIS_STATUS_SUCCESS)
     return;
@@ -466,7 +467,7 @@
     GEIS_XCB_FULL_WINDOW,
     &xcb_win_info
   };
-  GeisInstance instance;
+  GeisInstance instance = nullptr;
 
   status = geis_init(&win_info, &instance);
   if (status != GEIS_STATUS_SUCCESS)