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

Fix FS#10139 (broken seek for very long mp3 files) through avoiding int32 overflow in calculation.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20755 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Andree Buschmann 2009-04-20 19:10:27 +00:00
parent be8a27ad81
commit f7a9125781
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
apps/codecs/mpa.c
View file

@ -91,12 +91,17 @@ static int get_file_pos(int newtime)
struct mp3entry *id3 = ci->id3;
if (id3->vbr) {
/* Convert newtime and id3->length to seconds to
* avoid overflow */
unsigned int newtime_s = newtime/1000;
unsigned int length_s = id3->length/1000;
if (id3->has_toc) {
/* Use the TOC to find the new position */
unsigned int percent, remainder;
int curtoc, nexttoc, plen;
percent = (newtime*100) / id3->length;
percent = (newtime_s*100) / length_s;
if (percent > 99)
percent = 99;
@ -111,14 +116,13 @@ static int get_file_pos(int newtime)
pos = (id3->filesize/256)*curtoc;
/* Use the remainder to get a more accurate position */
remainder = (newtime*100) % id3->length;
remainder = (remainder*100) / id3->length;
remainder = (newtime_s*100) % length_s;
remainder = (remainder*100) / length_s;
plen = (nexttoc - curtoc)*(id3->filesize/256);
pos += (plen/100)*remainder;
} else {
/* No TOC exists, estimate the new position */
pos = (id3->filesize / (id3->length / 1000)) *
(newtime / 1000);
pos = (id3->filesize / length_s) * newtime_s;
}
} else if (id3->bitrate) {
pos = newtime * (id3->bitrate / 8);