nihilazo/rockbox
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

keyboard: check length of the last line. avoid dividing by 0.

Browse Source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24643 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Teruaki Kawashima 2010-02-14 05:00:41 +00:00
parent 59d13ccf68
commit ed21ab1c8c
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/recorder/keyboard.c
View File

@ -157,7 +157,7 @@ static const unsigned char morse_codes[] = {
int load_kbd(unsigned char* filename)
{
int fd, l;
int i = 0, line_len, max_line_len;
int i, line_len, max_line_len;
unsigned char buf[4];
if (filename == NULL)
@ -171,7 +171,8 @@ int load_kbd(unsigned char* filename)
return 1;
line_len = 0;
max_line_len = 0;
max_line_len = 1;
i = 0;
while (read(fd, buf, 1) == 1 && i < KBD_BUF_SIZE)
{
/* check how many bytes to read for this character */
@ -215,6 +216,9 @@ int load_kbd(unsigned char* filename)
close(fd);
kbd_loaded = true;
if (max_line_len < line_len)
max_line_len = line_len;
FOR_NB_SCREENS(l)
{
struct keyboard_parameters *pm = &kbd_param[l];
@ -948,6 +952,8 @@ static void kbd_calc_params(struct keyboard_parameters *pm,
i++;
}
}
if (pm->nchars == 0)
pm->kbd_buf[pm->nchars++] = ' ';
/* calculate pm->pages and pm->lines */
sc_h = sc->getheight();