diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2011-02-28 00:59:44 +0000 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2011-02-28 00:59:44 +0000 |
| commit | d69d406e096d9df587e9b263cc16553d17b63162 (patch) | |
| tree | 137c8ed34db4a5fc0f21bdb8ce5a2c5ca32061dd | |
| parent | 613a26d507c8c79bc38710fbf4e6f619620e6f14 (diff) | |
| download | rockbox-d69d406e096d9df587e9b263cc16553d17b63162.zip rockbox-d69d406e096d9df587e9b263cc16553d17b63162.tar.gz rockbox-d69d406e096d9df587e9b263cc16553d17b63162.tar.bz2 rockbox-d69d406e096d9df587e9b263cc16553d17b63162.tar.xz | |
Android: Fix crash when playback is passing invalid metadata around.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29454 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/hosted/notification.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/apps/hosted/notification.c b/apps/hosted/notification.c index 4df5b9d..faa1247 100644 --- a/apps/hosted/notification.c +++ b/apps/hosted/notification.c @@ -56,13 +56,12 @@ static void track_changed_callback(void *param) char buf[200]; const char * ptitle = id3->title; - if (!ptitle) + if (!ptitle && *id3->path) { /* pass the filename as title if id3 info isn't available */ - ptitle = - strip_extension(buf, sizeof(buf), strrchr(id3->path,'/') + 1); + ptitle = strip_extension(buf, sizeof(buf), strrchr(id3->path,'/') + 1); } - title = e->NewStringUTF(env_ptr, ptitle); + title = e->NewStringUTF(env_ptr, ptitle ?: ""); artist = e->NewStringUTF(env_ptr, id3->artist ?: ""); album = e->NewStringUTF(env_ptr, id3->album ?: ""); |