diff options
| author | Marco Nelissen <marcone@google.com> | 2015-08-07 16:36:08 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-07 16:36:08 +0000 |
| commit | e0e37e13bc9e62e58484d1e54e66eaf506744548 (patch) | |
| tree | 004b73ebbe0fdfb5ff41d6f340e0274f6b34512c /include | |
| parent | 821b6c29d3d5782ae17aedc77f406c9eaf2ab2fb (diff) | |
| parent | 48192b84db39879e7d83a2f4e7023048fb81ee8e (diff) | |
| download | frameworks_av-e0e37e13bc9e62e58484d1e54e66eaf506744548.zip frameworks_av-e0e37e13bc9e62e58484d1e54e66eaf506744548.tar.gz frameworks_av-e0e37e13bc9e62e58484d1e54e66eaf506744548.tar.bz2 | |
am 48192b84: am 0625841d: am dfaea255: am 578d5b66: am 171b5fad: am d6ea7f65: am f26400c9: Fix crash on malformed id3
* commit '48192b84db39879e7d83a2f4e7023048fb81ee8e':
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 726b197..8d4e15a 100644 --- a/include/media/stagefright/MetaData.h +++ b/include/media/stagefright/MetaData.h @@ -268,7 +268,7 @@ private: return mSize <= sizeof(u.reservoir); } - void allocateStorage(size_t size); + void *allocateStorage(size_t size); void freeStorage(); void *storage() { |