summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2012-05-07 15:10:01 +0200
committerBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2012-05-07 15:10:01 +0200
commit681fc12b00cabc77d8ae9b539a286c50408d7cc1 (patch)
treee03fcd794f81710d5cef5270b84f7cb216bac036
parent2c29128203feda0a25539a94864302dc68d40d92 (diff)
downloadbase-681fc12b00cabc77d8ae9b539a286c50408d7cc1.tar.gz
libmediaplayerservice: Fix crash caused by strict-aliasing fix
long a[] and long *a aren't always the same... Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
-rw-r--r--media/libmediaplayerservice/MediaPlayerService.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index 893934a048fb..011c0b972583 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -541,8 +541,8 @@ static player_type getDefaultPlayerType() {
player_type getPlayerType(int fd, int64_t offset, int64_t length)
{
union {
- char buf[20];
- long *bufl;
+ char buf[20];
+ long bufl[];
};
lseek(fd, offset, SEEK_SET);
read(fd, buf, sizeof(buf));