From 56f252a265b3a82e4138b2af3ec6e39286fc7009 Mon Sep 17 00:00:00 2001 From: Alexey Yakovenko Date: Fri, 23 Apr 2010 20:45:29 +0200 Subject: don't crash on reloading apev2 tags --- junklib.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'junklib.c') diff --git a/junklib.c b/junklib.c index 0a54a5c8..770ddc69 100644 --- a/junklib.c +++ b/junklib.c @@ -40,8 +40,8 @@ #define UTF8 "utf-8" -//#define trace(...) { fprintf(stderr, __VA_ARGS__); } -#define trace(fmt,...) +#define trace(...) { fprintf(stderr, __VA_ARGS__); } +//#define trace(fmt,...) #define min(x,y) ((x)<(y)?(x):(y)) #define max(x,y) ((x)>(y)?(x):(y)) @@ -784,9 +784,11 @@ junk_apev2_read_full (playItem_t *it, DB_apev2_tag_t *tag_store, DB_FILE *fp) { uint32_t flags = extract_i32_le (&header[20]); trace ("APEv%d, size=%d, items=%d, flags=%x\n", version, size, numitems, flags); - uint32_t f = pl_get_item_flags (it); - f |= DDB_TAG_APEV2; - pl_set_item_flags (it, f); + if (it) { + uint32_t f = pl_get_item_flags (it); + f |= DDB_TAG_APEV2; + pl_set_item_flags (it, f); + } // now seek to beginning of the tag (exluding header) if (deadbeef->fseek (fp, -size, SEEK_CUR) == -1) { -- cgit v1.2.3