summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--tests/test-ls.c4
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f19fc4a..69b143b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-30-01 Christophe Fergeau <teuf@gnome.org>
+
+ Patch by Martin Aumueller
+
+ * tests/test-ls.c: make sure the various fields we are trying to
+ print aren't NULL, this fixes a crash that was observed with
+ iphones
+
2007-11-15 Christophe Fergeau <teuf@gnome.org>
* src/itdb_itunesdb.c: don't use itdb_filename_ipod2fs to generate
diff --git a/tests/test-ls.c b/tests/test-ls.c
index 1488da6..ed881e7 100644
--- a/tests/test-ls.c
+++ b/tests/test-ls.c
@@ -70,7 +70,9 @@ static void
display_track (Itdb_Track *track, const char *prefix)
{
g_print ("%s%s - %s - %s\n", prefix,
- track->artist, track->album, track->title);
+ track->artist ? track->artist : "(null)",
+ track->album ? track->album : "(null)",
+ track->title ? track->title : "(null)");
g_print ("%s\t%s\n", prefix, track->ipod_path);
}