diff options
| author | Nicolas Pennequin <nicolas.pennequin@free.fr> | 2008-01-08 23:48:51 +0000 |
|---|---|---|
| committer | Nicolas Pennequin <nicolas.pennequin@free.fr> | 2008-01-08 23:48:51 +0000 |
| commit | 659fe5a35bad0483f67f52ba032b02de98d49407 (patch) | |
| tree | eff26be00dd26a27622ce73b3ea9b145f0311414 /apps | |
| parent | 5fd859b68a47583eb26e5d6ebfb51b883d3b0761 (diff) | |
| download | rockbox-659fe5a35bad0483f67f52ba032b02de98d49407.zip rockbox-659fe5a35bad0483f67f52ba032b02de98d49407.tar.gz rockbox-659fe5a35bad0483f67f52ba032b02de98d49407.tar.bz2 rockbox-659fe5a35bad0483f67f52ba032b02de98d49407.tar.xz | |
Fix FS#6215 (player crashes after trying to resume deleted music file). As mentioned in the lastest comment, the problem was in trying to resume at an offset larger than the size of the file following the one that was deleted. This revealed a crash in the buffering code, which gets a fix, but we also need to intervene earlier in the track loading so that the track that gets played will be from its start.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16028 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/buffering.c | 3 | ||||
| -rw-r--r-- | apps/playback.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/apps/buffering.c b/apps/buffering.c index 531413b..2d7ca22 100644 --- a/apps/buffering.c +++ b/apps/buffering.c @@ -880,6 +880,9 @@ int bufopen(const char *file, size_t offset, enum data_type type) size_t size = filesize(fd); bool can_wrap = type==TYPE_PACKET_AUDIO || type==TYPE_CODEC; + if (offset > size) + offset = 0; + struct memory_handle *h = add_handle(size-offset, can_wrap, false); if (!h) { diff --git a/apps/playback.c b/apps/playback.c index 1e5cd62..ed581cd 100644 --- a/apps/playback.c +++ b/apps/playback.c @@ -1683,6 +1683,9 @@ static bool audio_load_track(int offset, bool start_play) tracks[track_widx].filesize = filesize(fd); + if ((unsigned)offset > tracks[track_widx].filesize) + offset = 0; + /* Set default values */ if (start_play) { |