devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

bufgetid3 should be used carefully, as it can return NULL.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17143 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Nicolas Pennequin 2008-04-16 16:41:35 +00:00
parent de026dcede
commit 2cf6345a0e
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
apps/playback.c
View file

@ -1519,13 +1519,17 @@ static bool audio_loadcodec(bool start_play)
{ {
int prev_track; int prev_track;
char codec_path[MAX_PATH]; /* Full path to codec */ char codec_path[MAX_PATH]; /* Full path to codec */
const struct mp3entry *id3, *prev_id3;
if (tracks[track_widx].id3_hid < 0) { if (tracks[track_widx].id3_hid < 0) {
return false; return false;
} }
const char * codec_fn = id3 = bufgetid3(tracks[track_widx].id3_hid);
get_codec_filename(bufgetid3(tracks[track_widx].id3_hid)->codectype); if (!id3)
return false;
const char *codec_fn = get_codec_filename(id3->codectype);
if (codec_fn == NULL) if (codec_fn == NULL)
return false; return false;
@ -1550,12 +1554,14 @@ static bool audio_loadcodec(bool start_play)
{ {
prev_track = (track_widx - 1) & MAX_TRACK_MASK; prev_track = (track_widx - 1) & MAX_TRACK_MASK;
id3 = bufgetid3(tracks[track_widx].id3_hid);
prev_id3 = bufgetid3(tracks[prev_track].id3_hid);
/* If the previous codec is the same as this one, there is no need /* If the previous codec is the same as this one, there is no need
* to put another copy of it on the file buffer */ * to put another copy of it on the file buffer */
if (get_codec_base_type( if (id3 && prev_id3 &&
bufgetid3(tracks[track_widx].id3_hid)->codectype) == get_codec_base_type(id3->codectype) ==
get_codec_base_type( get_codec_base_type(prev_id3->codectype)
bufgetid3(tracks[prev_track].id3_hid)->codectype)
&& audio_codec_loaded) && audio_codec_loaded)
{ {
logf("Reusing prev. codec"); logf("Reusing prev. codec");