MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-03-31 09:43:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

more defensive aac scanning to fix bug #47

Browse Source
This commit is contained in:
Ron Pedde 2006-04-05 06:31:33 +00:00
parent 0028d16aa0
commit b147348dbd
2 changed files with 164 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

147
src/scan-aac.c
View File

@ -75,6 +75,8 @@ off_t scan_aac_drilltoatom(FILE *aac_fp,char *atom_path,
char *cur_p, *end_p; char *cur_p, *end_p;
char atom_name[5]; char atom_name[5];
DPRINTF(E_SPAM,L_SCAN,"Searching for %s\n",atom_path);
fseek(aac_fp, 0, SEEK_END); fseek(aac_fp, 0, SEEK_END);
file_size = ftell(aac_fp); file_size = ftell(aac_fp);
rewind(aac_fp); rewind(aac_fp);
@ -203,80 +205,91 @@ int scan_get_aacinfo(char *filename, MP3FILE *pmp3) {
while(current_offset < (long)atom_length) { while(current_offset < (long)atom_length) {
if(fread((void*)&current_size,1,sizeof(int),fin) != sizeof(int)) if(fread((void*)&current_size,1,sizeof(int),fin) != sizeof(int))
break; break;
DPRINTF(E_SPAM,L_SCAN,"Current size: %d\n");
current_size=ntohl(current_size); current_size=ntohl(current_size);
if(current_size <= 7) /* something not right */ if(current_size <= 7) /* something not right */
break; break;
if(fread(current_atom,1,4,fin) != 4) if(fread(current_atom,1,4,fin) != 4)
break; break;
len=current_size-7; /* for ill-formed too-short tags */ DPRINTF(E_SPAM,L_SCAN,"Current Atom: %c%c%c%c\n",
if(len < 22) current_atom[0],current_atom[1],current_atom[2],
len=22; current_atom[3]);
current_data=(char*)malloc(len); /* extra byte */ if(current_size > 4096) { /* Does this break anything? */
memset(current_data,0x00,len); /* too big! cover art, maybe? */
fseek(fin,current_size - 8 - 7,SEEK_CUR);
} else {
len=current_size-7; /* for ill-formed too-short tags */
if(len < 22)
len=22;
current_data=(char*)malloc(len); /* extra byte */
memset(current_data,0x00,len);
if(fread(current_data,1,current_size-8,fin) != current_size-8)
break;
if(!memcmp(current_atom,"\xA9" "nam",4)) { /* Song name */
pmp3->title=strdup((char*)&current_data[16]);
} else if(!memcmp(current_atom,"\xA9" "ART",4)) {
pmp3->artist=strdup((char*)&current_data[16]);
} else if(!memcmp(current_atom,"\xA9" "alb",4)) {
pmp3->album=strdup((char*)&current_data[16]);
} else if(!memcmp(current_atom,"\xA9" "cmt",4)) {
pmp3->comment=strdup((char*)&current_data[16]);
} else if(!memcmp(current_atom,"\xA9" "wrt",4)) {
pmp3->composer=strdup((char*)&current_data[16]);
} else if(!memcmp(current_atom,"\xA9" "grp",4)) {
pmp3->grouping=strdup((char*)&current_data[16]);
} else if(!memcmp(current_atom,"\xA9" "gen",4)) {
/* can this be a winamp genre??? */
pmp3->genre=strdup((char*)&current_data[16]);
} else if(!memcmp(current_atom,"tmpo",4)) {
us_data=*((unsigned short *)&current_data[16]);
us_data=ntohs(us_data);
pmp3->bpm=us_data;
} else if(!memcmp(current_atom,"trkn",4)) {
us_data=*((unsigned short *)&current_data[18]);
us_data=ntohs(us_data);
pmp3->track=us_data;
if(fread(current_data,1,current_size-8,fin) != current_size-8) us_data=*((unsigned short *)&current_data[20]);
break; us_data=ntohs(us_data);
if(!memcmp(current_atom,"\xA9" "nam",4)) { /* Song name */ pmp3->total_tracks=us_data;
pmp3->title=strdup((char*)&current_data[16]); } else if(!memcmp(current_atom,"disk",4)) {
} else if(!memcmp(current_atom,"\xA9" "ART",4)) { us_data=*((unsigned short *)&current_data[18]);
pmp3->artist=strdup((char*)&current_data[16]); us_data=ntohs(us_data);
} else if(!memcmp(current_atom,"\xA9" "alb",4)) {
pmp3->album=strdup((char*)&current_data[16]); pmp3->disc=us_data;
} else if(!memcmp(current_atom,"\xA9" "cmt",4)) {
pmp3->comment=strdup((char*)&current_data[16]); us_data=*((unsigned short *)&current_data[20]);
} else if(!memcmp(current_atom,"\xA9" "wrt",4)) { us_data=ntohs(us_data);
pmp3->composer=strdup((char*)&current_data[16]);
} else if(!memcmp(current_atom,"\xA9" "grp",4)) { pmp3->total_discs=us_data;
pmp3->grouping=strdup((char*)&current_data[16]); } else if(!memcmp(current_atom,"\xA9" "day",4)) {
} else if(!memcmp(current_atom,"\xA9" "gen",4)) { pmp3->year=atoi((char*)&current_data[16]);
/* can this be a winamp genre??? */ } else if(!memcmp(current_atom,"gnre",4)) {
pmp3->genre=strdup((char*)&current_data[16]); genre=(int)(*((char*)&current_data[17]));
} else if(!memcmp(current_atom,"tmpo",4)) { genre--;
us_data=*((unsigned short *)&current_data[16]);
us_data=ntohs(us_data); if((genre < 0) || (genre > WINAMP_GENRE_UNKNOWN))
pmp3->bpm=us_data; genre=WINAMP_GENRE_UNKNOWN;
} else if(!memcmp(current_atom,"trkn",4)) {
us_data=*((unsigned short *)&current_data[18]); pmp3->genre=strdup(scan_winamp_genre[genre]);
us_data=ntohs(us_data); } else if (!memcmp(current_atom, "cpil", 4)) {
pmp3->compilation = current_data[16];
pmp3->track=us_data; }
us_data=*((unsigned short *)&current_data[20]); free(current_data);
us_data=ntohs(us_data); current_offset+=current_size;
pmp3->total_tracks=us_data;
} else if(!memcmp(current_atom,"disk",4)) {
us_data=*((unsigned short *)&current_data[18]);
us_data=ntohs(us_data);
pmp3->disc=us_data;
us_data=*((unsigned short *)&current_data[20]);
us_data=ntohs(us_data);
pmp3->total_discs=us_data;
} else if(!memcmp(current_atom,"\xA9" "day",4)) {
pmp3->year=atoi((char*)&current_data[16]);
} else if(!memcmp(current_atom,"gnre",4)) {
genre=(int)(*((char*)&current_data[17]));
genre--;
if((genre < 0) || (genre > WINAMP_GENRE_UNKNOWN))
genre=WINAMP_GENRE_UNKNOWN;
pmp3->genre=strdup(scan_winamp_genre[genre]);
} else if (!memcmp(current_atom, "cpil", 4)) {
pmp3->compilation = current_data[16];
} }
free(current_data);
current_offset+=current_size;
} }
} }
@ -331,6 +344,12 @@ int scan_get_aacinfo(char *filename, MP3FILE *pmp3) {
atom_offset=scan_aac_drilltoatom(fin, atom_offset=scan_aac_drilltoatom(fin,
"moov:trak:mdia:minf:stbl:stsd:mp4a", "moov:trak:mdia:minf:stbl:stsd:mp4a",
&atom_length); &atom_length);
if(atom_offset == -1) {
atom_offset=scan_aac_drilltoatom(fin,
"moov:trak:mdia:minf:stbl:stsd:drms",
&atom_length);
}
if (atom_offset != -1) { if (atom_offset != -1) {
fseek(fin, atom_offset + 32, SEEK_SET); fseek(fin, atom_offset + 32, SEEK_SET);

145
src/scan-mp4.c
View File

@ -93,80 +93,91 @@ int scan_get_mp4info(char *filename, MP3FILE *pmp3) {
while(current_offset < (long) atom_length) { while(current_offset < (long) atom_length) {
if(fread((void*)&current_size,1,sizeof(int),fin) != sizeof(int)) if(fread((void*)&current_size,1,sizeof(int),fin) != sizeof(int))
break; break;
DPRINTF(E_SPAM,L_SCAN,"Current size: %d\n");
current_size=ntohl(current_size); current_size=ntohl(current_size);
if(current_size <= 7) /* something not right */ if(current_size <= 7) /* something not right */
break; break;
if(fread(current_atom,1,4,fin) != 4) if(fread(current_atom,1,4,fin) != 4)
break; break;
len=current_size-7; /* for ill-formed too-short tags */ DPRINTF(E_SPAM,L_SCAN,"Current Atom: %c%c%c%c\n",
if(len < 22) current_atom[0],current_atom[1],current_atom[2],
len=22; current_atom[3]);
current_data=(char*)malloc(len); /* extra byte */ if(current_size > 4096) { /* Does this break anything? */
memset(current_data,0x00,len); /* too big! cover art, maybe? */
fseek(fin,current_size - 8 - 7,SEEK_CUR);
} else {
len=current_size-7; /* for ill-formed too-short tags */
if(len < 22)
len=22;
current_data=(char*)malloc(len); /* extra byte */
memset(current_data,0x00,len);
if(fread(current_data,1,current_size-8,fin) != current_size-8)
break;
if(!memcmp(current_atom,"\xA9" "nam",4)) { /* Song name */
pmp3->title=strdup((char*)&current_data[16]);
} else if(!memcmp(current_atom,"\xA9" "ART",4)) {
pmp3->artist=strdup((char*)&current_data[16]);
} else if(!memcmp(current_atom,"\xA9" "alb",4)) {
pmp3->album=strdup((char*)&current_data[16]);
} else if(!memcmp(current_atom,"\xA9" "cmt",4)) {
pmp3->comment=strdup((char*)&current_data[16]);
} else if(!memcmp(current_atom,"\xA9" "wrt",4)) {
pmp3->composer=strdup((char*)&current_data[16]);
} else if(!memcmp(current_atom,"\xA9" "grp",4)) {
pmp3->grouping=strdup((char*)&current_data[16]);
} else if(!memcmp(current_atom,"\xA9" "gen",4)) {
/* can this be a winamp genre??? */
pmp3->genre=strdup((char*)&current_data[16]);
} else if(!memcmp(current_atom,"tmpo",4)) {
us_data=*((unsigned short *)&current_data[16]);
us_data=ntohs(us_data);
pmp3->bpm=us_data;
} else if(!memcmp(current_atom,"trkn",4)) {
us_data=*((unsigned short *)&current_data[18]);
us_data=ntohs(us_data);
pmp3->track=us_data;
if(fread(current_data,1,current_size-8,fin) != current_size-8) us_data=*((unsigned short *)&current_data[20]);
break; us_data=ntohs(us_data);
if(!memcmp(current_atom,"\xA9" "nam",4)) { /* Song name */ pmp3->total_tracks=us_data;
pmp3->title=strdup((char*)&current_data[16]); } else if(!memcmp(current_atom,"disk",4)) {
} else if(!memcmp(current_atom,"\xA9" "ART",4)) { us_data=*((unsigned short *)&current_data[18]);
pmp3->artist=strdup((char*)&current_data[16]); us_data=ntohs(us_data);
} else if(!memcmp(current_atom,"\xA9" "alb",4)) {
pmp3->album=strdup((char*)&current_data[16]); pmp3->disc=us_data;
} else if(!memcmp(current_atom,"\xA9" "cmt",4)) {
pmp3->comment=strdup((char*)&current_data[16]); us_data=*((unsigned short *)&current_data[20]);
} else if(!memcmp(current_atom,"\xA9" "wrt",4)) { us_data=ntohs(us_data);
pmp3->composer=strdup((char*)&current_data[16]);
} else if(!memcmp(current_atom,"\xA9" "grp",4)) { pmp3->total_discs=us_data;
pmp3->grouping=strdup((char*)&current_data[16]); } else if(!memcmp(current_atom,"\xA9" "day",4)) {
} else if(!memcmp(current_atom,"\xA9" "gen",4)) { pmp3->year=atoi((char*)&current_data[16]);
/* can this be a winamp genre??? */ } else if(!memcmp(current_atom,"gnre",4)) {
pmp3->genre=strdup((char*)&current_data[16]); genre=(int)(*((char*)&current_data[17]));
} else if(!memcmp(current_atom,"tmpo",4)) { genre--;
us_data=*((unsigned short *)&current_data[16]);
us_data=ntohs(us_data); if((genre < 0) || (genre > WINAMP_GENRE_UNKNOWN))
pmp3->bpm=us_data; genre=WINAMP_GENRE_UNKNOWN;
} else if(!memcmp(current_atom,"trkn",4)) {
us_data=*((unsigned short *)&current_data[18]); pmp3->genre=strdup(scan_winamp_genre[genre]);
us_data=ntohs(us_data); } else if (!memcmp(current_atom, "cpil", 4)) {
pmp3->compilation = current_data[16];
pmp3->track=us_data; }
us_data=*((unsigned short *)&current_data[20]); free(current_data);
us_data=ntohs(us_data); current_offset+=current_size;
pmp3->total_tracks=us_data;
} else if(!memcmp(current_atom,"disk",4)) {
us_data=*((unsigned short *)&current_data[18]);
us_data=ntohs(us_data);
pmp3->disc=us_data;
us_data=*((unsigned short *)&current_data[20]);
us_data=ntohs(us_data);
pmp3->total_discs=us_data;
} else if(!memcmp(current_atom,"\xA9" "day",4)) {
pmp3->year=atoi((char*)&current_data[16]);
} else if(!memcmp(current_atom,"gnre",4)) {
genre=(int)(*((char*)&current_data[17]));
genre--;
if((genre < 0) || (genre > WINAMP_GENRE_UNKNOWN))
genre=WINAMP_GENRE_UNKNOWN;
pmp3->genre=strdup(scan_winamp_genre[genre]);
} else if (!memcmp(current_atom, "cpil", 4)) {
pmp3->compilation = current_data[16];
} }
free(current_data);
current_offset+=current_size;
} }
} }
@ -208,6 +219,12 @@ int scan_get_mp4info(char *filename, MP3FILE *pmp3) {
atom_offset=scan_aac_drilltoatom(fin, atom_offset=scan_aac_drilltoatom(fin,
"moov:trak:mdia:minf:stbl:stsd:mp4a", "moov:trak:mdia:minf:stbl:stsd:mp4a",
&atom_length); &atom_length);
if(atom_offset == -1) {
atom_offset=scan_aac_drilltoatom(fin,
"moov:trak:mdia:minf:stbl:stsd:drms",
&atom_length);
}
if (atom_offset != -1) { if (atom_offset != -1) {
fseek(fin, atom_offset + 32, SEEK_SET); fseek(fin, atom_offset + 32, SEEK_SET);