rhythmbox r6174 - in trunk: . lib

[jmatthew svn gnome org]

Author: jmatthew
Date: Tue Mar  3 01:35:39 2009
New Revision: 6174
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=6174&view=rev

Log:
2009-03-03  Jonathan Matthew  <jonathan d14n org>

	* lib/rb-file-helpers.c: (rb_uri_append_uri):
	g_file_get_path sometimes returns NULL, so rb_uri_append_uri should do
	the same.  Fixes #573325.


Modified:
   trunk/ChangeLog
   trunk/lib/rb-file-helpers.c

Modified: trunk/lib/rb-file-helpers.c
==============================================================================
--- trunk/lib/rb-file-helpers.c	(original)
+++ trunk/lib/rb-file-helpers.c	Tue Mar  3 01:35:39 2009
@@ -882,6 +882,10 @@
 	GFile *f = g_file_new_for_uri (fragment);
 
 	path = g_file_get_path (f);
+	if (path == NULL) {
+		g_object_unref (f);
+		return NULL;
+	}
 
 	rv = rb_uri_append_path (uri, path);
 	g_free (path);