[rhythmbox] don't crash when transferring files with no extension (bug #616411)
- From: Jonathan Matthew <jmatthew src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rhythmbox] don't crash when transferring files with no extension (bug #616411)
- Date: Sun, 25 Apr 2010 02:44:48 +0000 (UTC)
commit 3e697f910f14a212f5747d88473309b60c81f68d
Author: Jonathan Matthew <jonathan d14n org>
Date: Sun Apr 25 12:41:30 2010 +1000
don't crash when transferring files with no extension (bug #616411)
plugins/ipod/rb-ipod-source.c | 9 ++++++---
plugins/mtpdevice/rb-mtp-source.c | 3 +++
sources/rb-removable-media-source.c | 2 +-
3 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/plugins/ipod/rb-ipod-source.c b/plugins/ipod/rb-ipod-source.c
index 5c2d862..dbaf6e4 100644
--- a/plugins/ipod/rb-ipod-source.c
+++ b/plugins/ipod/rb-ipod-source.c
@@ -1691,9 +1691,12 @@ ipod_get_filename_for_uri (const gchar *mount_point,
*escaped = 0;
}
- escaped = g_strdup_printf ("%s.%s", filename, extension);
- g_free (filename);
-
+ if (extension != NULL) {
+ escaped = g_strdup_printf ("%s.%s", filename, extension);
+ g_free (filename);
+ } else {
+ escaped = filename;
+ }
result = generate_ipod_filename (mount_point, escaped);
g_free (escaped);
diff --git a/plugins/mtpdevice/rb-mtp-source.c b/plugins/mtpdevice/rb-mtp-source.c
index 5438316..573c01b 100644
--- a/plugins/mtpdevice/rb-mtp-source.c
+++ b/plugins/mtpdevice/rb-mtp-source.c
@@ -1223,6 +1223,9 @@ impl_build_dest_uri (RBRemovableMediaSource *source,
* encoder; and then passed to whatever gets called when the transfer is complete.
*/
id = rhythmdb_entry_get_ulong (entry, RHYTHMDB_PROP_ENTRY_ID);
+ if (extension == NULL) {
+ extension = "";
+ }
uri = g_strdup_printf ("xrbmtp://%lu/%s/%d", id, extension, filetype);
return uri;
}
diff --git a/sources/rb-removable-media-source.c b/sources/rb-removable-media-source.c
index 3cf1f7f..1096b8a 100644
--- a/sources/rb-removable-media-source.c
+++ b/sources/rb-removable-media-source.c
@@ -417,7 +417,7 @@ impl_paste (RBSource *source, GList *entries)
}
/* make sure the extension isn't ludicrously long */
- if (strlen (extension) > EXTENSION_LENGTH_LIMIT) {
+ if (extension != NULL && strlen (extension) > EXTENSION_LENGTH_LIMIT) {
extension[EXTENSION_LENGTH_LIMIT] = '\0';
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]