From 0bb5aeec314260ec20e982ba6977911d7d6f2c3e Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Wed, 30 Nov 2005 19:18:47 +0000 Subject: 2005-11-30 Christophe Fergeau * src/db-artwork-parser.c: (parse_mhni): don't crash if ipod_image_new_from_mhni returns NULL git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1182 f01d2545-417e-4e96-918e-98f8d0dbbcb6 --- ChangeLog | 5 +++++ src/db-artwork-parser.c | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 350df06..2b16f72 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-11-30 Christophe Fergeau + + * src/db-artwork-parser.c: (parse_mhni): don't crash if + ipod_image_new_from_mhni returns NULL + 2005-11-28 Christophe Fergeau * src/itdb_artwork.c: (unpack_RGB_565), (get_pixel_data): diff --git a/src/db-artwork-parser.c b/src/db-artwork-parser.c index fe88b7e..6796bbe 100644 --- a/src/db-artwork-parser.c +++ b/src/db-artwork-parser.c @@ -158,11 +158,13 @@ parse_mhni (DBParseContext *ctx, iPodSong *song, GError *error) dump_mhni (mhni); thumb = ipod_image_new_from_mhni (mhni, song->itdb); - if (thumb != NULL) { - song->artwork->thumbnails = - g_list_append (song->artwork->thumbnails, thumb); + if (thumb == NULL) { + return 0; } + song->artwork->thumbnails = + g_list_append (song->artwork->thumbnails, thumb); + mhod_ctx = db_parse_context_get_sub_context (ctx, ctx->header_len); if (mhod_ctx == NULL) { return -1; -- cgit