summaryrefslogtreecommitdiff
path: root/firmware/mpeg.c
diff options
context:
space:
mode:
authorMagnus Holmgren <magnushol@gmail.com>2005-12-22 21:42:00 +0000
committerMagnus Holmgren <magnushol@gmail.com>2005-12-22 21:42:00 +0000
commit917f2c1804c1c581c09fdd1a6cd219298da54964 (patch)
tree822ae744ce7772d21ecb67acd4de52eb3333dee7 /firmware/mpeg.c
parentb1a230353e81863189e0be1603c1ee6fa653485d (diff)
downloadrockbox-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
Diffstat (limited to 'firmware/mpeg.c')
-rw-r--r--firmware/mpeg.c9
1 files changed, 6 insertions, 3 deletions
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;