properly parse aliases

2008-03-03  Benjamin Otte  <otte@gnome.org>

	* client/gdaemonvfs.c: (fill_mountable_info):
	properly parse aliases


svn path=/trunk/; revision=1512

2 files changed, 13 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index ca970768..2e12ce17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-03-03  Benjamin Otte  <otte@gnome.org>
 
+	* client/gdaemonvfs.c: (fill_mountable_info):
+	properly parse aliases
+
+2008-03-03  Benjamin Otte  <otte@gnome.org>
+
 	* client/gvfsuriutils.c: (g_vfs_decode_uri):
 	revert yesterday's commit. It broke the obex and gphoto backends. We
 	now parse hostnames different for internet hosts.
diff --git a/client/gdaemonvfs.c b/client/gdaemonvfs.c
index 6577822d..736cec97 100644
--- a/client/gdaemonvfs.c
+++ b/client/gdaemonvfs.c
@@ -596,11 +596,15 @@ fill_mountable_info (GDaemonVfs *vfs)
 	  g_ptr_array_add (uri_schemes, g_strdup (scheme));
 	}
       
-      info->scheme_aliases = g_new (char *, scheme_aliases_len);
-      for (i = 0; i < scheme_aliases_len; i++)
+      if (scheme_aliases_len > 0)
 	{
-	  info->scheme_aliases[i] = g_strdup (scheme_aliases[i]);
-	  g_ptr_array_add (uri_schemes, g_strdup (scheme_aliases[i]));
+	  info->scheme_aliases = g_new (char *, scheme_aliases_len + 1);
+	  for (i = 0; i < scheme_aliases_len; i++)
+	    {
+	      info->scheme_aliases[i] = g_strdup (scheme_aliases[i]);
+	      g_ptr_array_add (uri_schemes, g_strdup (scheme_aliases[i]));
+	    }
+	  info->scheme_aliases[scheme_aliases_len] = NULL;
 	}
 	
       info->default_port = default_port;