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