[maemo-commits] [maemo-commits] r15375 - in projects/haf/trunk/hail: . debian hail/hail-hildon-desktop

[From: subversion at stage.maemo.org]

Author: atdomoko
Date: 2008-04-09 16:31:45 +0300 (Wed, 09 Apr 2008)
New Revision: 15375

Modified:
   projects/haf/trunk/hail/ChangeLog
   projects/haf/trunk/hail/debian/changelog
   projects/haf/trunk/hail/hail/hail-hildon-desktop/haildesktopitem.c
Log:
fix for NB#79659



Modified: projects/haf/trunk/hail/ChangeLog
===================================================================
--- projects/haf/trunk/hail/ChangeLog	2008-04-09 13:09:12 UTC (rev 15374)
+++ projects/haf/trunk/hail/ChangeLog	2008-04-09 13:31:45 UTC (rev 15375)
@@ -1,5 +1,12 @@
-2008-02-13 Attila Domokos <attila.domokos at nokia.co>
+2008-04-09 Attila Domokos <attila.domokos at nokia.com>
 
+	* hail/hail-hildon-desktop/haildesktopitem.c
+	(hail_desktop_item_get_name): add a NULL check on the string name,
+	to avoid to access it
+	* Fixes: NB#79659
+	
+2008-02-13 Attila Domokos <attila.domokos at nokia.com>
+
 	* hail/hail-hildon-libs/hailcalendartable.[ch]
 	* hail/hail-hildon-libs/hailcalendararrow.[ch]
 	* hail/hail-hildon-libs/hailcalendarcell.[ch]

Modified: projects/haf/trunk/hail/debian/changelog
===================================================================
--- projects/haf/trunk/hail/debian/changelog	2008-04-09 13:09:12 UTC (rev 15374)
+++ projects/haf/trunk/hail/debian/changelog	2008-04-09 13:31:45 UTC (rev 15375)
@@ -1,3 +1,12 @@
+hail (2.0.1-2) unstable; urgency=low
+
+  * hail/hail-hildon-desktop/haildesktopitem.c
+    (hail_desktop_item_get_name): add a NULL check on the string name,
+    to avoid to access it
+  * Fixes: NB#79659
+
+ -- Attila Domokos <attila.domokos at nokia.com>  Wed, 9 Apr 2008 16:09:55 +0200
+
 hail (2.0.1-1) unstable; urgency=low
 
   * hail/hail-hildon-libs/hailcalendartable.[ch]

Modified: projects/haf/trunk/hail/hail/hail-hildon-desktop/haildesktopitem.c
===================================================================
--- projects/haf/trunk/hail/hail/hail-hildon-desktop/haildesktopitem.c	2008-04-09 13:09:12 UTC (rev 15374)
+++ projects/haf/trunk/hail/hail/hail-hildon-desktop/haildesktopitem.c	2008-04-09 13:31:45 UTC (rev 15375)
@@ -178,9 +178,13 @@
 	{
 	  name = g_path_get_basename(name_tmp);
 
-	  /* remove */
-	  dot = g_strrstr (name, ".");
-	  *dot = '\0';
+          /* remove */
+          dot = g_strrstr (name, ".");
+          if (dot != NULL) 
+            {
+              /* This shouldn't happens, and probably the name is bad formed */
+              *dot = '\0';
+            }
 	}
     }