1 |
mrpouet 09/08/24 20:51:24 |
2 |
|
3 |
Added: rhythmbox-0.12.3-sigsegv-no-saveable-types.patch |
4 |
Log: |
5 |
Fix bug #282546, application crashed when song properties was opened, Patch import from upstream bug #590108. Clean up old revision. |
6 |
(Portage version: 2.2_rc40/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 media-sound/rhythmbox/files/rhythmbox-0.12.3-sigsegv-no-saveable-types.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/rhythmbox/files/rhythmbox-0.12.3-sigsegv-no-saveable-types.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/rhythmbox/files/rhythmbox-0.12.3-sigsegv-no-saveable-types.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: rhythmbox-0.12.3-sigsegv-no-saveable-types.patch |
15 |
=================================================================== |
16 |
From 47a5f4753d1cfcd2bcc2de10daeaa7a71f598d5d Mon Sep 17 00:00:00 2001 |
17 |
From: Jonathan Matthew <jonathan@××××.org> |
18 |
Date: Wed, 29 Jul 2009 10:36:48 +0000 |
19 |
Subject: metadata: don't crash if there are no saveable types (bug #590108) |
20 |
|
21 |
--- |
22 |
diff --git a/metadata/rb-metadata-dbus-client.c b/metadata/rb-metadata-dbus-client.c |
23 |
index 8683446..30e1760 100644 |
24 |
--- a/metadata/rb-metadata-dbus-client.c |
25 |
+++ b/metadata/rb-metadata-dbus-client.c |
26 |
@@ -349,9 +349,13 @@ start_metadata_service (GError **error) |
27 |
return FALSE; |
28 |
} |
29 |
|
30 |
- saveable_type_list = g_strjoinv (", ", saveable_types); |
31 |
- rb_debug ("saveable types from metadata helper: %s", saveable_type_list); |
32 |
- g_free (saveable_type_list); |
33 |
+ if (saveable_types != NULL) { |
34 |
+ saveable_type_list = g_strjoinv (", ", saveable_types); |
35 |
+ rb_debug ("saveable types from metadata helper: %s", saveable_type_list); |
36 |
+ g_free (saveable_type_list); |
37 |
+ } else { |
38 |
+ rb_debug ("unable to save metadata for any file types"); |
39 |
+ } |
40 |
|
41 |
if (message) |
42 |
dbus_message_unref (message); |
43 |
@@ -704,10 +708,12 @@ rb_metadata_can_save (RBMetaData *md, const char *mimetype) |
44 |
} |
45 |
} |
46 |
|
47 |
- for (i = 0; saveable_types[i] != NULL; i++) { |
48 |
- if (g_str_equal (mimetype, saveable_types[i])) { |
49 |
- result = TRUE; |
50 |
- break; |
51 |
+ if (saveable_types != NULL) { |
52 |
+ for (i = 0; saveable_types[i] != NULL; i++) { |
53 |
+ if (g_str_equal (mimetype, saveable_types[i])) { |
54 |
+ result = TRUE; |
55 |
+ break; |
56 |
+ } |
57 |
} |
58 |
} |
59 |
|
60 |
-- |
61 |
cgit v0.8.2 |