diff options
| author |  Alexey Yakovenko <waker@users.sourceforge.net> | 2014-06-27 20:32:42 +0200 |
|---|---|---|
| committer | Alexey Yakovenko <waker@users.sourceforge.net> | 2014-06-27 20:32:42 +0200 |
| commit | 8910345b6e0f5818ad5c093bf36a62b829f5a6d5 (patch) | |
| tree | 066a8bc9955709366f567aacc9982de7e55ac4c9 /plugins | |
| parent | 7729999b9170601154156a762062f1d5cc3d20dd (diff) | |
artwork: proper support for data length indicator when parsing APIC
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/artwork/artwork.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/plugins/artwork/artwork.c b/plugins/artwork/artwork.c index 41963292..64a1a11c 100644 --- a/plugins/artwork/artwork.c +++ b/plugins/artwork/artwork.c @@ -70,8 +70,8 @@ static uintptr_t imlib_mutex; #define min(x,y) ((x)<(y)?(x):(y)) -//#define trace(...) { fprintf(stderr, __VA_ARGS__); } -#define trace(...) +#define trace(...) { fprintf(stderr, __VA_ARGS__); } +//#define trace(...) static char default_cover[PATH_MAX]; #define DEFAULT_FILEMASK "*cover*.jpg;*front*.jpg;*folder*.jpg;*cover*.png;*front*.png;*folder*.png" @@ -1001,10 +1001,23 @@ fetcher_thread (void *none) trace ("artwork: id3v2 APIC frame is too small\n"); continue; } + uint8_t *data = f->data; - if (f->flags[1] == 3) { + + if (tag.version[0] == 4 && (f->flags[1] & 1)) { data += 4; } +#if 0 + printf ("version: %d, flags: %d %d\n", (int)tag.version[0], (int)f->flags[0], (int)f->flags[1]); + for (int i = 0; i < 20; i++) { + printf ("%c", data[i] < 0x20 ? '?' : data[i]); + } + printf ("\n"); + for (int i = 0; i < 20; i++) { + printf ("%02x ", data[i]); + } + printf ("\n"); +#endif uint8_t *end = f->data + f->size; int enc = *data; data++; // enc |