[maemo-commits] [maemo-commits] r15481 - in projects/haf/trunk/hildon-fm: . debian hildon-fm

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2008-04-24 12:52:33 +0300 (Thu, 24 Apr 2008)
New Revision: 15481

Modified:
   projects/haf/trunk/hildon-fm/ChangeLog
   projects/haf/trunk/hildon-fm/debian/changelog
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-smb.c
Log:
patch for 79106


Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2008-04-23 14:24:31 UTC (rev 15480)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2008-04-24 09:52:33 UTC (rev 15481)
@@ -1,3 +1,10 @@
+2008-04-24  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
+
+	* hildon-fm/hildon-file-system-smb.c
+	(my_file_folder_child_files_added): Add MY_IS_FILE_FOLDER() check.
+	(my_file_folder_child_folder_added): Add MY_IS_FILE_FOLDER() check.
+	Fixes: NB#79106
+
 2008-04-23  Marius Vollmer  <marius.vollmer at nokia.com>
 
 	Released 2.0.4

Modified: projects/haf/trunk/hildon-fm/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-fm/debian/changelog	2008-04-23 14:24:31 UTC (rev 15480)
+++ projects/haf/trunk/hildon-fm/debian/changelog	2008-04-24 09:52:33 UTC (rev 15481)
@@ -1,6 +1,7 @@
 libhildonfm (1:2.0.5~unreleased) unstable; urgency=low
 
-  * 
+  * Add checks to hildon-file-system-smb.c signal handlers to avoid a crash.
+    Fixes: NB#79106
 
  -- Marius Vollmer <marius.vollmer at nokia.com>  Wed, 23 Apr 2008 17:21:24 +0300
 

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-smb.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-smb.c	2008-04-23 14:24:31 UTC (rev 15480)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-smb.c	2008-04-24 09:52:33 UTC (rev 15481)
@@ -395,9 +395,15 @@
                                  GSList *paths,
                                  gpointer data)
 {
-  MyFileFolder *my_folder = MY_FILE_FOLDER (data);
+  MyFileFolder *my_folder;
+  GSList *my_paths;
 
-  GSList *my_paths;
+  if (MY_IS_FILE_FOLDER(data))
+      my_folder = MY_FILE_FOLDER (data);
+  else {
+      return;
+  }
+
   my_paths = NULL;
   while (paths)
     {
@@ -424,8 +430,15 @@
                                   const GError *error,
                                   gpointer data)
 {
-  MyFileFolder *my_folder = MY_FILE_FOLDER (data);
+  MyFileFolder *my_folder;
 
+  if (MY_IS_FILE_FOLDER(data))
+      my_folder = MY_FILE_FOLDER (data);
+  else {
+      g_object_unref (handle);
+      return;
+  }
+ 
   my_folder->handles = g_slist_remove (my_folder->handles, handle);
 
   g_object_unref (handle);