[maemo-commits] [maemo-commits] r14982 - in projects/haf/trunk/osso-gnome-vfs2/debian: . patches

[From: subversion at stage.maemo.org]

Author: richard
Date: 2007-12-17 12:52:23 +0200 (Mon, 17 Dec 2007)
New Revision: 14982

Added:
   projects/haf/trunk/osso-gnome-vfs2/debian/patches/45-NB78397-xdg-leak.patch
Modified:
   projects/haf/trunk/osso-gnome-vfs2/debian/changelog
Log:
NB#78397

Modified: projects/haf/trunk/osso-gnome-vfs2/debian/changelog
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/debian/changelog	2007-12-14 18:39:14 UTC (rev 14981)
+++ projects/haf/trunk/osso-gnome-vfs2/debian/changelog	2007-12-17 10:52:23 UTC (rev 14982)
@@ -1,3 +1,9 @@
+osso-gnome-vfs2 (2.16.3-1osso35) unstable; urgency=low
+
+  * Fixes: NB#78397, repeating xdg_mime ops leak xdg_mime hash allocations
+
+ -- Richard Hult <richard at imendio.com>  Mon, 17 Dec 2007 11:46:16 +0100
+
 osso-gnome-vfs2 (2.16.3-1osso34) unstable; urgency=low
 
   * Fixes: NB#78315, ne_gnomevfs_last_error accessing freed memory

Added: projects/haf/trunk/osso-gnome-vfs2/debian/patches/45-NB78397-xdg-leak.patch
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/debian/patches/45-NB78397-xdg-leak.patch	2007-12-14 18:39:14 UTC (rev 14981)
+++ projects/haf/trunk/osso-gnome-vfs2/debian/patches/45-NB78397-xdg-leak.patch	2007-12-17 10:52:23 UTC (rev 14982)
@@ -0,0 +1,34 @@
+Index: libgnomevfs/xdgmimeglob.c
+===================================================================
+RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/xdgmimeglob.c,v
+retrieving revision 1.11
+diff -u -p -w -r1.11 xdgmimeglob.c
+--- libgnomevfs/xdgmimeglob.c	1 Dec 2005 19:32:02 -0000	1.11
++++ libgnomevfs/xdgmimeglob.c	21 Feb 2006 19:42:37 -0000
+@@ -263,7 +263,7 @@ _xdg_glob_hash_insert_text (XdgGlobHashN
+ 		{
+ 		  child = _xdg_glob_hash_node_new ();
+ 		  child->character = '\000';
+-		  child->mime_type = mime_type;
++		  child->mime_type = strdup (mime_type);
+ 		  child->child = NULL;
+ 		  child->next = node->child;
+ 		  node->child = child;
+@@ -272,7 +272,7 @@ _xdg_glob_hash_insert_text (XdgGlobHashN
+ 	}
+       else
+ 	{
+-	  node->mime_type = mime_type;
++	  node->mime_type = strdup (mime_type);
+ 	}
+     }
+   else
+@@ -475,7 +475,7 @@ _xdg_glob_hash_append_glob (XdgGlobHash 
+       glob_hash->literal_list = _xdg_glob_list_append (glob_hash->literal_list, strdup (glob), strdup (mime_type));
+       break;
+     case XDG_GLOB_SIMPLE:
+-      glob_hash->simple_node = _xdg_glob_hash_insert_text (glob_hash->simple_node, glob + 1, strdup (mime_type));
++      glob_hash->simple_node = _xdg_glob_hash_insert_text (glob_hash->simple_node, glob + 1, mime_type);
+       break;
+     case XDG_GLOB_FULL:
+       glob_hash->full_list = _xdg_glob_list_append (glob_hash->full_list, strdup (glob), strdup (mime_type));