[maemo-commits] [maemo-commits] r18046 - in projects/haf/trunk/desktop-file-utils/debian: . patches

[From: subversion at stage.maemo.org]

Author: richard
Date: 2009-04-09 11:29:07 +0300 (Thu, 09 Apr 2009)
New Revision: 18046

Added:
   projects/haf/trunk/desktop-file-utils/debian/patches/02-NB108853-keep-on-trucking.patch
Modified:
   projects/haf/trunk/desktop-file-utils/debian/changelog
Log:
NB108853

Modified: projects/haf/trunk/desktop-file-utils/debian/changelog
===================================================================
--- projects/haf/trunk/desktop-file-utils/debian/changelog	2009-04-09 07:15:29 UTC (rev 18045)
+++ projects/haf/trunk/desktop-file-utils/debian/changelog	2009-04-09 08:29:07 UTC (rev 18046)
@@ -1,3 +1,9 @@
+desktop-file-utils (0.12-2osso4) unstable; urgency=low
+
+  * Fixes: NB#108853, Coverity findings in desktop-file-utils
+
+ -- Richard Hult <richard at imendio.com>  Thu,  9 Apr 2009 10:22:00 +0200
+
 desktop-file-utils (0.12-2osso3) unstable; urgency=low
 
   * Fixes: NB#106603 Need to add mapping for certificate files to certificicate

Added: projects/haf/trunk/desktop-file-utils/debian/patches/02-NB108853-keep-on-trucking.patch
===================================================================
--- projects/haf/trunk/desktop-file-utils/debian/patches/02-NB108853-keep-on-trucking.patch	2009-04-09 07:15:29 UTC (rev 18045)
+++ projects/haf/trunk/desktop-file-utils/debian/patches/02-NB108853-keep-on-trucking.patch	2009-04-09 08:29:07 UTC (rev 18046)
@@ -0,0 +1,15 @@
+Index: src/validate.c
+===================================================================
+--- src/validate.c	(revision 18012)
++++ src/validate.c	(working copy)
+@@ -858,9 +858,8 @@ required_actions (GnomeDesktopFile *df, 
+ 
+ 	  if (!g_hash_table_lookup (actions_data.hash, actions [i]))
+ 	    {
+-	      print_fatal (filename, "Action key contains '%s' but file has \"Desktop Action %s\" section\n",
++	      print_fatal (filename, "Action key contains '%s' but file has no \"Desktop Action %s\" section\n",
+ 			   actions [i], actions [i]);
+-	      goto out;
+ 	    }
+ 
+ 	  g_hash_table_remove (actions_data.hash, actions [i]);