summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJorg Schuler <jcsjcs@users.sourceforge.net>2006-05-05 13:56:03 +0000
committerJorg Schuler <jcsjcs@users.sourceforge.net>2006-05-05 13:56:03 +0000
commit71360efa6cfecfceb10c41c522ad8b775fb038af (patch)
tree838671c251dcf672cdd7170282d00ab303debd60
parentcac23ce995e682641a465ad5b9e33e4660e8103b (diff)
downloadlibgpod-tmz-71360efa6cfecfceb10c41c522ad8b775fb038af.tar.gz
libgpod-tmz-71360efa6cfecfceb10c41c522ad8b775fb038af.tar.xz
libgpod-tmz-71360efa6cfecfceb10c41c522ad8b775fb038af.zip
* src/itdb_itunesdb.c: avoid segfault if album field of podcasts
is not set (NULL). git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1252 f01d2545-417e-4e96-918e-98f8d0dbbcb6
-rw-r--r--ChangeLog5
-rw-r--r--src/itdb_itunesdb.c13
2 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 0850c88..3c57177 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-05 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * src/itdb_itunesdb.c: avoid segfault if album field of podcasts
+ is not set (NULL).
+
2006-05-02 Jorg Schuler <jcsjcs at users.sourceforge.net>
* src/itdb_itunesdb.c: smart playlists: avoid assertion
diff --git a/src/itdb_itunesdb.c b/src/itdb_itunesdb.c
index f82021f..821f756 100644
--- a/src/itdb_itunesdb.c
+++ b/src/itdb_itunesdb.c
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-05-02 23:14:46 jcs>
+/* Time-stamp: <2006-05-05 01:07:19 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -3920,14 +3920,21 @@ static gboolean write_podcast_mhips (FExport *fexp,
for (gl=pl->members; gl; gl=gl->next)
{
GList **memberlist;
+ gchar *album;
Itdb_Track *track = gl->data;
g_return_val_if_fail (track, FALSE);
- memberlist = g_hash_table_lookup (album_hash, track->album);
+ if (track->album)
+ album = track->album;
+ else
+ album = "";
+
+ memberlist = g_hash_table_lookup (album_hash, album);
+
if (!memberlist)
{
memberlist = g_new0 (GList *, 1);
- g_hash_table_insert (album_hash, track->album, memberlist);
+ g_hash_table_insert (album_hash, album, memberlist);
}
*memberlist = g_list_append (*memberlist, track);
}