len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-09 21:25:19 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Codecs: wma: don't fail in case parsing errors in album art

Browse source 
Fixes FS#12576 (album art is not shown but file is now playable)

Change-Id: Idc8e1dcf7b5760b4fd37c43913a534ed4eae512a
This commit is contained in:
Roman Artiukhin 2024-10-19 10:24:27 +03:00
parent 8c1c8597ac
commit f3d6196016
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/rbcodec/metadata/asf.c
View file

@ -515,17 +515,17 @@ static int asf_parse_header(int fd, struct mp3entry* id3,
/* Expected is either "01 00 xx xx 03 yy yy yy yy" or /* Expected is either "01 00 xx xx 03 yy yy yy yy" or
* "03 yy yy yy yy". xx is the size of the WM/Picture * "03 yy yy yy yy". xx is the size of the WM/Picture
* container in bytes. yy equals the raw data length of * container in bytes. yy equals the raw data length of
* the embedded image. */ * the embedded image.
lseek(fd, -4, SEEK_CUR); *
* Also save position after this tag in file in case any parsing errors */
uint32_t after_pic_pos = lseek(fd, -4, SEEK_CUR) + 4 + length;
if (read(fd, &type, 1) != 1) if (read(fd, &type, 1) != 1)
type = 0; type = 0;
if (type == 1) { if (type == 1) {
lseek(fd, 3, SEEK_CUR); lseek(fd, 3, SEEK_CUR);
read(fd, &type, 1); read(fd, &type, 1);
/* In case the parsing will fail in the next step we
* might at least be able to skip the whole section. */
datalength = length - 1;
} }
if (type == 3) { if (type == 3) {
/* Read the raw data length of the embedded image. */ /* Read the raw data length of the embedded image. */
@ -570,7 +570,7 @@ static int asf_parse_header(int fd, struct mp3entry* id3,
} }
} }
lseek(fd, datalength, SEEK_CUR); lseek(fd, after_pic_pos, SEEK_SET);
#endif #endif
} else if (!strncmp("replaygain_", utf8buf, 11)) { } else if (!strncmp("replaygain_", utf8buf, 11)) {
char *value = id3buf; char *value = id3buf;