diff options
| author | Marco Nelissen <marcone@google.com> | 2015-08-07 15:01:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-07 15:01:52 +0000 |
| commit | 48192b84db39879e7d83a2f4e7023048fb81ee8e (patch) | |
| tree | da2e27ff472d39842ee796d3523785036acd6d42 /include/media | |
| parent | 9ac30bd4a43e025ce27c0a78bbe2ac05a66bcbda (diff) | |
| parent | 0625841daae5bb1351034909ce705aab517eea2d (diff) | |
| download | frameworks_av-48192b84db39879e7d83a2f4e7023048fb81ee8e.zip frameworks_av-48192b84db39879e7d83a2f4e7023048fb81ee8e.tar.gz frameworks_av-48192b84db39879e7d83a2f4e7023048fb81ee8e.tar.bz2 | |
am 0625841d: am dfaea255: am 578d5b66: am 171b5fad: am d6ea7f65: am f26400c9: Fix crash on malformed id3
* commit '0625841daae5bb1351034909ce705aab517eea2d':
Fix crash on malformed id3
Diffstat (limited to 'include/media')
| -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() { |