summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJorg Schuler <jcsjcs@users.sourceforge.net>2007-08-18 08:11:26 +0000
committerJorg Schuler <jcsjcs@users.sourceforge.net>2007-08-18 08:11:26 +0000
commit5f00b9b1c0f775d72c89869927743061787ea3f6 (patch)
tree2e498145fc664c6d83c3a1cb40da015716cf66e2
parenta7431ec30f884f67db894b9dfbd1c55b139a1b65 (diff)
downloadlibgpod-5f00b9b1c0f775d72c89869927743061787ea3f6.tar.gz
libgpod-5f00b9b1c0f775d72c89869927743061787ea3f6.tar.xz
libgpod-5f00b9b1c0f775d72c89869927743061787ea3f6.zip
* 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
-rw-r--r--ChangeLog4
-rw-r--r--src/itdb_artwork.c8
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 <nicholas at users.sourceforge.net>
* 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 <jcsjcs at users sourceforge net>
| 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);
}