diff options
| author | teuf <teuf@f01d2545-417e-4e96-918e-98f8d0dbbcb6> | 2008-05-30 12:04:25 +0000 |
|---|---|---|
| committer | teuf <teuf@f01d2545-417e-4e96-918e-98f8d0dbbcb6> | 2008-05-30 12:04:25 +0000 |
| commit | 2696be788fcfde4119b84c8e478263c63ee553b8 (patch) | |
| tree | e7535a070c2552c93f33cbc28b26e1dad69dc73a | |
| parent | 271b0c73506712135b34478420a6733aa8c41bdd (diff) | |
| download | libgpod-2696be788fcfde4119b84c8e478263c63ee553b8.tar.gz libgpod-2696be788fcfde4119b84c8e478263c63ee553b8.tar.xz libgpod-2696be788fcfde4119b84c8e478263c63ee553b8.zip | |
Patch from Ian Stewart
* src/itdb_itunesdb.c: don't pass NULL sort_composer names down to
jump_table_letter, fixes a crash reported by Andy Busch
git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1992 f01d2545-417e-4e96-918e-98f8d0dbbcb6
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/itdb_itunesdb.c | 5 |
2 files changed, 10 insertions, 2 deletions
@@ -1,5 +1,12 @@ 2008-05-30 Christophe Fergeau <teuf@gnome.org> + Patch from Ian Stewart + + * src/itdb_itunesdb.c: don't pass NULL sort_composer names down to + jump_table_letter, fixes a crash reported by Andy Busch + +2008-05-30 Christophe Fergeau <teuf@gnome.org> + * src/Makefile.am: * src/db-artwork-parser.c: * src/db-artwork-writer.c: diff --git a/src/itdb_itunesdb.c b/src/itdb_itunesdb.c index b7a4e51..e6d0ced 100644 --- a/src/itdb_itunesdb.c +++ b/src/itdb_itunesdb.c @@ -3775,6 +3775,7 @@ static gunichar2 jump_table_letter (gchar *p) gunichar chr = 0; gboolean found_alnum_chars = FALSE; + g_return_val_if_fail (p != NULL, '0'); g_assert (g_utf8_validate (p, -1, NULL)); while (*p != '\0') { @@ -3911,12 +3912,12 @@ static GList *mhod52_make_collate_keys (GList *tracks) else if (tr->composer) { ct->composer = g_utf8_collate_key (tr->composer, -1); - ct->letter_composer = jump_table_letter (tr->sort_composer); + ct->letter_composer = jump_table_letter (tr->composer); } else { ct->composer = g_strdup (""); - ct->letter_composer = jump_table_letter (tr->composer); + ct->letter_composer = '0'; } ct->track_nr = tr->track_nr; |