diff options
author | Marco Nelissen <marcone@google.com> | 2015-08-07 14:56:01 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-07 14:56:01 +0000 |
commit | 0625841daae5bb1351034909ce705aab517eea2d (patch) | |
tree | 7e77aeb1072938040bab56ba4a9ed6b48c0a8473 /include | |
parent | 9f7bceff18052171b3042bda945d7e4e94b60f1c (diff) | |
parent | dfaea255546340742b42c216663f61c6b7301c4f (diff) | |
download | frameworks_av-0625841daae5bb1351034909ce705aab517eea2d.zip frameworks_av-0625841daae5bb1351034909ce705aab517eea2d.tar.gz frameworks_av-0625841daae5bb1351034909ce705aab517eea2d.tar.bz2 |
am dfaea255: am 578d5b66: am 171b5fad: am d6ea7f65: am f26400c9: Fix crash on malformed id3
* commit 'dfaea255546340742b42c216663f61c6b7301c4f':
Fix crash on malformed id3
Diffstat (limited to 'include')
-rw-r--r-- | include/media/stagefright/MetaData.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/stagefright/MetaData.h b/include/media/stagefright/MetaData.h index 087d016..3f42790 100644 --- a/include/media/stagefright/MetaData.h +++ b/include/media/stagefright/MetaData.h @@ -260,7 +260,7 @@ private: return mSize <= sizeof(u.reservoir); } - void allocateStorage(size_t size); + void *allocateStorage(size_t size); void freeStorage(); void *storage() { |