From 139724536bae43b09cdbe95c4dcadf0bf5bdd751 Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Fri, 30 May 2008 12:04:25 +0000 Subject: 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 --- ChangeLog | 7 +++++++ src/itdb_itunesdb.c | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index bab20b0..e4728d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-05-30 Christophe Fergeau + + 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 * src/Makefile.am: 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; -- cgit