diff options
| author | Marco Nelissen <marcone@google.com> | 2015-08-07 14:47:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-07 14:47:48 +0000 |
| commit | dfaea255546340742b42c216663f61c6b7301c4f (patch) | |
| tree | 7e77aeb1072938040bab56ba4a9ed6b48c0a8473 /include | |
| parent | fbf1c8d65fe257847b35ec7289f9450ac34c8034 (diff) | |
| parent | 578d5b66fc9f5e36ca0cb19b21771aa85ec131ee (diff) | |
| download | frameworks_av-dfaea255546340742b42c216663f61c6b7301c4f.zip frameworks_av-dfaea255546340742b42c216663f61c6b7301c4f.tar.gz frameworks_av-dfaea255546340742b42c216663f61c6b7301c4f.tar.bz2 | |
am 578d5b66: am 171b5fad: am d6ea7f65: am f26400c9: Fix crash on malformed id3
* commit '578d5b66fc9f5e36ca0cb19b21771aa85ec131ee':
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() { |