summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2015-08-07 14:25:10 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-07 14:25:10 +0000
commitd6ea7f65dd31d5dacf497cc3c494d4fa3910f7c3 (patch)
treeb62ef0d8d86dd5a159fda3997b7b7369ced8a96c /include
parent42bd61d73e8b4d0b1101e73324a59fde51077112 (diff)
parentf26400c9d01a0e2f71690d5ebc644270f098d590 (diff)
downloadframeworks_av-d6ea7f65dd31d5dacf497cc3c494d4fa3910f7c3.zip
frameworks_av-d6ea7f65dd31d5dacf497cc3c494d4fa3910f7c3.tar.gz
frameworks_av-d6ea7f65dd31d5dacf497cc3c494d4fa3910f7c3.tar.bz2
am f26400c9: Fix crash on malformed id3
* commit 'f26400c9d01a0e2f71690d5ebc644270f098d590': Fix crash on malformed id3
Diffstat (limited to 'include')
-rw-r--r--include/media/stagefright/MetaData.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/stagefright/MetaData.h b/include/media/stagefright/MetaData.h
index db8216b..f51c12d 100644
--- a/include/media/stagefright/MetaData.h
+++ b/include/media/stagefright/MetaData.h
@@ -248,7 +248,7 @@ private:
return mSize <= sizeof(u.reservoir);
}
- void allocateStorage(size_t size);
+ void *allocateStorage(size_t size);
void freeStorage();
void *storage() {