Fixes: NB#275522 - Booster::requestSplash() segfault

RevBy: Pertti Kellomäki

debian/changelog

@@ -1,6 +1,7 @@
 applauncherd (2.0.0) unstable; urgency=low
 
-  * Fixes: #274302 - don't unload the main binary
+  * Fixes: NB#274302 - don't unload the main binary
+  * Fixes: NB#275522 - Booster::requestSplash() segfault
 
  -- Alexey Shilov <alexey.shilov@nokia.com>  Thu, 18 Aug 2011 15:43:02 +0300
 

src/launcherlib/booster.cpp

@@ -378,7 +378,10 @@ void Booster::requestSplash(const int pid, const std::string &wmclass,
         int retval = XGetWindowProperty(dpy, rootWin, compositorWindowIdAtom,
                                         0, 0x7fffffff, False, XA_WINDOW,
                                         &type, &format, &nItems, &bytesAfter, &prop);
-        if (retval == Success) 
+
+        // Check not only return value but also make sure
+        // that property was found so pointer isn't NULL
+        if ((retval == Success) && (prop != NULL))
         {
             // Package up the data and set the property
             int len = pidStr.length() + 1