diff options
author | Magnus Holmgren <magnushol@gmail.com> | 2005-12-22 21:42:00 +0000 |
---|---|---|
committer | Magnus Holmgren <magnushol@gmail.com> | 2005-12-22 21:42:00 +0000 |
commit | 917f2c1804c1c581c09fdd1a6cd219298da54964 (patch) | |
tree | 822ae744ce7772d21ecb67acd4de52eb3333dee7 | |
parent | b1a230353e81863189e0be1603c1ee6fa653485d (diff) | |
download | rockbox-917f2c1804c1c581c09fdd1a6cd219298da54964.tar.gz rockbox-917f2c1804c1c581c09fdd1a6cd219298da54964.zip |
Simulator fixes: id3 string pointers can be null.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8282 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/playback.c | 9 | ||||
-rw-r--r-- | firmware/mpeg.c | 9 |
2 files changed, 12 insertions, 6 deletions
diff --git a/apps/playback.c b/apps/playback.c index dda3ea7bdd..1e9bca6c36 100644 --- a/apps/playback.c +++ b/apps/playback.c | |||
@@ -1027,9 +1027,12 @@ static bool read_next_metadata(void) | |||
1027 | status = get_metadata(&tracks[next_track],fd,trackname,v1first); | 1027 | status = get_metadata(&tracks[next_track],fd,trackname,v1first); |
1028 | /* Preload the glyphs in the tags */ | 1028 | /* Preload the glyphs in the tags */ |
1029 | if (status) { | 1029 | if (status) { |
1030 | lcd_getstringsize(tracks[next_track].id3.title, NULL, NULL); | 1030 | if (tracks[next_track].id3.title) |
1031 | lcd_getstringsize(tracks[next_track].id3.artist, NULL, NULL); | 1031 | lcd_getstringsize(tracks[next_track].id3.title, NULL, NULL); |
1032 | lcd_getstringsize(tracks[next_track].id3.album, NULL, NULL); | 1032 | if (tracks[next_track].id3.artist) |
1033 | lcd_getstringsize(tracks[next_track].id3.artist, NULL, NULL); | ||
1034 | if (tracks[next_track].id3.album) | ||
1035 | lcd_getstringsize(tracks[next_track].id3.album, NULL, NULL); | ||
1033 | } | 1036 | } |
1034 | track_changed = true; | 1037 | track_changed = true; |
1035 | close(fd); | 1038 | close(fd); |
diff --git a/firmware/mpeg.c b/firmware/mpeg.c index 5b1a543f2d..f1bb97291a 100644 --- a/firmware/mpeg.c +++ b/firmware/mpeg.c | |||
@@ -920,9 +920,12 @@ static struct trackdata *add_track_to_tag_list(const char *filename) | |||
920 | track->mempos = audiobuf_write; | 920 | track->mempos = audiobuf_write; |
921 | track->id3.elapsed = 0; | 921 | track->id3.elapsed = 0; |
922 | #ifdef HAVE_LCD_BITMAP | 922 | #ifdef HAVE_LCD_BITMAP |
923 | lcd_getstringsize(track->id3.title, NULL, NULL); | 923 | if (track->id3.title) |
924 | lcd_getstringsize(track->id3.artist, NULL, NULL); | 924 | lcd_getstringsize(track->id3.title, NULL, NULL); |
925 | lcd_getstringsize(track->id3.album, NULL, NULL); | 925 | if (track->id3.artist) |
926 | lcd_getstringsize(track->id3.artist, NULL, NULL); | ||
927 | if (track->id3.album) | ||
928 | lcd_getstringsize(track->id3.album, NULL, NULL); | ||
926 | #endif | 929 | #endif |
927 | 930 | ||
928 | track_write_idx = (track_write_idx+1) & MAX_TRACK_ENTRIES_MASK; | 931 | track_write_idx = (track_write_idx+1) & MAX_TRACK_ENTRIES_MASK; |