1
0
Fork 0
forked from len0rd/rockbox

WPS subline times >25.5s caused overflow, since time_mult[] was only 8 bits

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5344 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Linus Nielsen Feltzing 2004-10-25 13:14:26 +00:00
parent 45a4381ff9
commit 804c2005e1

View file

@ -79,7 +79,7 @@ static char map_fullbar_char(char ascii_val);
static char format_buffer[FORMAT_BUFFER_SIZE]; static char format_buffer[FORMAT_BUFFER_SIZE];
static char* format_lines[MAX_LINES][MAX_SUBLINES]; static char* format_lines[MAX_LINES][MAX_SUBLINES];
static unsigned char line_type[MAX_LINES][MAX_SUBLINES]; static unsigned char line_type[MAX_LINES][MAX_SUBLINES];
static unsigned char time_mult[MAX_LINES][MAX_SUBLINES]; static unsigned short time_mult[MAX_LINES][MAX_SUBLINES];
static long subline_expire_time[MAX_LINES]; static long subline_expire_time[MAX_LINES];
static int curr_subline[MAX_LINES]; static int curr_subline[MAX_LINES];
@ -310,7 +310,7 @@ static char* get_tag(struct mp3entry* cid3,
char* buf, char* buf,
int buf_size, int buf_size,
unsigned char* tag_len, unsigned char* tag_len,
unsigned char* subline_time_mult, unsigned short* subline_time_mult,
unsigned char* flags) unsigned char* flags)
{ {
struct mp3entry *id3 = cid3; /* default to current song */ struct mp3entry *id3 = cid3; /* default to current song */
@ -694,7 +694,7 @@ static void format_display(char* buf,
struct mp3entry* id3, struct mp3entry* id3,
struct mp3entry* nid3, /* next song's id3 */ struct mp3entry* nid3, /* next song's id3 */
const char* fmt, const char* fmt,
unsigned char* subline_time_mult, unsigned short* subline_time_mult,
unsigned char* flags) unsigned char* flags)
{ {
char temp_buf[128]; char temp_buf[128];