summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2004-10-25 13:14:26 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2004-10-25 13:14:26 +0000
commit804c2005e13f2edaf55e67e16e63000996ad0ef1 (patch)
tree5972ca6659238416b82d3ee914dfa397a95e4d6c /apps
parent45a4381ff979f52a313a183fee3cb91e29d9e9e3 (diff)
downloadrockbox-804c2005e13f2edaf55e67e16e63000996ad0ef1.tar.gz
rockbox-804c2005e13f2edaf55e67e16e63000996ad0ef1.zip
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
Diffstat (limited to 'apps')
-rw-r--r--apps/wps-display.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/wps-display.c b/apps/wps-display.c
index 339857710c..5ad8b188e2 100644
--- a/apps/wps-display.c
+++ b/apps/wps-display.c
@@ -79,7 +79,7 @@ static char map_fullbar_char(char ascii_val);
79static char format_buffer[FORMAT_BUFFER_SIZE]; 79static char format_buffer[FORMAT_BUFFER_SIZE];
80static char* format_lines[MAX_LINES][MAX_SUBLINES]; 80static char* format_lines[MAX_LINES][MAX_SUBLINES];
81static unsigned char line_type[MAX_LINES][MAX_SUBLINES]; 81static unsigned char line_type[MAX_LINES][MAX_SUBLINES];
82static unsigned char time_mult[MAX_LINES][MAX_SUBLINES]; 82static unsigned short time_mult[MAX_LINES][MAX_SUBLINES];
83static long subline_expire_time[MAX_LINES]; 83static long subline_expire_time[MAX_LINES];
84static int curr_subline[MAX_LINES]; 84static int curr_subline[MAX_LINES];
85 85
@@ -310,7 +310,7 @@ static char* get_tag(struct mp3entry* cid3,
310 char* buf, 310 char* buf,
311 int buf_size, 311 int buf_size,
312 unsigned char* tag_len, 312 unsigned char* tag_len,
313 unsigned char* subline_time_mult, 313 unsigned short* subline_time_mult,
314 unsigned char* flags) 314 unsigned char* flags)
315{ 315{
316 struct mp3entry *id3 = cid3; /* default to current song */ 316 struct mp3entry *id3 = cid3; /* default to current song */
@@ -694,7 +694,7 @@ static void format_display(char* buf,
694 struct mp3entry* id3, 694 struct mp3entry* id3,
695 struct mp3entry* nid3, /* next song's id3 */ 695 struct mp3entry* nid3, /* next song's id3 */
696 const char* fmt, 696 const char* fmt,
697 unsigned char* subline_time_mult, 697 unsigned short* subline_time_mult,
698 unsigned char* flags) 698 unsigned char* flags)
699{ 699{
700 char temp_buf[128]; 700 char temp_buf[128];