h->mode = 4; /* invalid */
return mode_text[h->mode];
}
+
static int header_bitrate(struct mp3header *h)
{
- if (h->layer > 3 || h->bitrate > 14)
+ if (!h->layer || h->layer > 3 || h->bitrate > 14 || !h->bitrate)
return -E_HEADER_BITRATE;
return mp3info_bitrate[h->version & 1][3 - h->layer][h->bitrate - 1];
}
struct mp3header h, h2;
long valid_start = 0;
- while (1) {
- while ((*fpos)++ < numbytes && map[*fpos] != 0xff)
- ;
- if (*fpos >= numbytes)
- return 0;
+ for (; *fpos < numbytes; (*fpos)++) {
+ if (map[*fpos] != 0xff)
+ continue;
valid_start = *fpos;
first_len = get_header(map, numbytes, fpos, &h);
if (first_len <= 0)
return first_len;
}
}
+ return 0;
}
static void mp3_get_id3(unsigned char *map, off_t numbytes, off_t *fpos)