From 5f00b9b1c0f775d72c89869927743061787ea3f6 Mon Sep 17 00:00:00 2001 From: Jorg Schuler Date: Sat, 18 Aug 2007 08:11:26 +0000 Subject: * src/itdb_artwork.c (itdb_thumb_get_filename): check returnvalue of strchr(). Thanks to Javier Kohen. git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1685 f01d2545-417e-4e96-918e-98f8d0dbbcb6 --- ChangeLog | 4 +++- src/itdb_artwork.c | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c34c658..a7dc490 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,7 +15,9 @@ * src/itdb_itunesdb (itdb_parse): don't call ipod_parse_artwork_db() if iTunesDB was not read successfully. - + * src/itdb_artwork.c (itdb_thumb_get_filename): check + returnvalue of strchr(). Thanks to Javier Kohen. + 2007-08-07 Nicholas Piper * bindings/python/gpod.i.in: Return an integer for time_t (note, diff --git a/src/itdb_artwork.c b/src/itdb_artwork.c index fc44250..ebac51f 100644 --- a/src/itdb_artwork.c +++ b/src/itdb_artwork.c @@ -1,4 +1,4 @@ -/* Time-stamp: <2007-03-21 17:30:57 jcs> +/* Time-stamp: <2007-08-18 16:22:17 jcs> | | Copyright (C) 2002-2005 Jorg Schuler | Part of the gtkpod project. @@ -413,7 +413,11 @@ gchar *itdb_thumb_get_filename (Itdb_Device *device, Itdb_Thumb *thumb) if (artwork_dir) { - filename = itdb_get_path (artwork_dir, strchr( thumb->filename+1, ':') + 1); + const gchar *name_on_disk = strchr( thumb->filename+1, ':'); + if (name_on_disk) + { + filename = itdb_get_path (artwork_dir, name_on_disk + 1); + } g_free (artwork_dir); } -- cgit