summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Arigo <markarigo@gmail.com>2006-11-16 21:04:04 +0000
committerMark Arigo <markarigo@gmail.com>2006-11-16 21:04:04 +0000
commita60caa9f542849931cd198f59cca1dff6b37e922 (patch)
treef5941b5b2ddd15869ab56dd6d78fed4133c98fa2
parent5f85fc50b1d454acbfb0818e0d031ff35dba7c54 (diff)
downloadrockbox-a60caa9f542849931cd198f59cca1dff6b37e922.zip
rockbox-a60caa9f542849931cd198f59cca1dff6b37e922.tar.gz
rockbox-a60caa9f542849931cd198f59cca1dff6b37e922.tar.bz2
rockbox-a60caa9f542849931cd198f59cca1dff6b37e922.tar.xz
Fix alignment issue that caused data aborts on arm targets
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11540 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/playback.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/playback.c b/apps/playback.c
index 8f4e4a6..279fb15 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -2260,8 +2260,10 @@ strip_ape_tag:
}
/* Read the version and length from the footer */
- version = letoh32(*(long *)(filebuf + tag_idx + 8));
- len = letoh32(*(long *)(filebuf + tag_idx + 12));
+ version = filebuf[tag_idx+8] | (filebuf[tag_idx+9] << 8) |
+ (filebuf[tag_idx+10] << 16) | (filebuf[tag_idx+11] << 24);
+ len = filebuf[tag_idx+12] | (filebuf[tag_idx+13] << 8) |
+ (filebuf[tag_idx+14] << 16) | (filebuf[tag_idx+15] << 24);
if (version == 2000)
len += 32; /* APEv2 has a 32 byte header */