[maemo-commits] [maemo-commits] r18130 - in projects/haf/trunk/libmatchbox2: . debian matchbox/core

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-04-22 12:53:53 +0300 (Wed, 22 Apr 2009)
New Revision: 18130

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/debian/changelog
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-decor.c
Log:
add NULL checks


Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-04-22 08:44:34 UTC (rev 18129)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-04-22 09:53:53 UTC (rev 18130)
@@ -1,3 +1,8 @@
+2009-04-22  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
+
+	* matchbox/core/mb-wm-decor.c (mb_wm_decor_release_handler): Add some
+	missing NULL checks.
+
 2009-04-21  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
 
 	Patch from Michal Maruska for handling WM_TAKE_FOCUS protocol.

Modified: projects/haf/trunk/libmatchbox2/debian/changelog
===================================================================
--- projects/haf/trunk/libmatchbox2/debian/changelog	2009-04-22 08:44:34 UTC (rev 18129)
+++ projects/haf/trunk/libmatchbox2/debian/changelog	2009-04-22 09:53:53 UTC (rev 18130)
@@ -1,10 +1,11 @@
-matchbox-window-manager-2 (0.2.34-1~unreleased) unstable; urgency=low
+matchbox-window-manager-2 (0.2.34-1) unstable; urgency=low
 
   * Patch from Michal Maruska for supporting WM_TAKE_FOCUS protocol.
   * Fixes: NB#111307 - WM: implement WM_TAKE_FOCUS, as XEmbed implem. in Gtk
     relies on it
+  * Added NULL checks to mb_wm_decor_release_handler to avoid crash.
 
- -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Fri, 17 Apr 2009 11:15:27 +0300
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Wed, 22 Apr 2009 12:49:18 +0300
 
 matchbox-window-manager-2 (0.2.33-1) unstable; urgency=low
 

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-decor.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-decor.c	2009-04-22 08:44:34 UTC (rev 18129)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-decor.c	2009-04-22 09:53:53 UTC (rev 18130)
@@ -205,8 +205,14 @@
 			     void            *userdata)
 {
   MBWMDecor       *decor  = userdata;
-  MBWindowManager *wm = decor->parent_client->wmref;
+  MBWindowManager *wm;
+ 
+  if (decor == NULL || decor->parent_client == NULL
+      || decor->parent_client->wmref == NULL)
+    return False;
 
+  wm = decor->parent_client->wmref;
+
   mb_wm_main_context_x_event_handler_remove (wm->main_ctx, ButtonRelease,
 					     decor->release_cb_id);