MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-12 15:33:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix for bad seeks on wma subheaders

Browse Source
This commit is contained in:
Ron Pedde 2006-08-31 00:37:16 +00:00
parent c594cb1ab2
commit e878464716
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/scan-wma.c
View File

@ -348,6 +348,7 @@ int wma_parse_header_extension(int fd, int size, MP3FILE *pmp3) {
WMA_SUBHEADER sh; WMA_SUBHEADER sh;
WMA_GUID *pguid; WMA_GUID *pguid;
long bytes_left; long bytes_left;
off_t current;
if(r_read(fd,&he,sizeof(he)) != sizeof(he)) if(r_read(fd,&he,sizeof(he)) != sizeof(he))
return FALSE; return FALSE;
@ -357,6 +358,8 @@ int wma_parse_header_extension(int fd, int size, MP3FILE *pmp3) {
while(bytes_left) { while(bytes_left) {
/* read in a subheader */ /* read in a subheader */
current = lseek(fd,0,SEEK_CUR);
if(r_read(fd,&sh,sizeof(sh)) != sizeof(sh)) if(r_read(fd,&sh,sizeof(sh)) != sizeof(sh))
return FALSE; return FALSE;
@ -383,12 +386,14 @@ int wma_parse_header_extension(int fd, int size, MP3FILE *pmp3) {
} }
DPRINTF(E_DBG,L_SCAN," Size: %ld\n",sh.size); DPRINTF(E_DBG,L_SCAN," Size: %ld\n",sh.size);
if(sh.size <= sizeof(sh))
return TRUE; /* guess we're done! */
bytes_left -= sh.size; bytes_left -= sh.size;
lseek(fd,sh.size - sizeof(sh),SEEK_CUR); lseek(fd,current + sh.size,SEEK_SET);
} }
return 1; return TRUE;
} }