diff options
| author | Marco Nelissen <marcone@google.com> | 2015-08-03 20:03:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-03 20:03:38 +0000 |
| commit | e6ca5b2d97f61e96af35fabed8c2ba352b8b5b99 (patch) | |
| tree | bf960284278238e255da38e8737c58225ed317a6 /media/libstagefright/MetaData.cpp | |
| parent | c655561b3580ae7ba3a721e69ac240606e11fab8 (diff) | |
| parent | 566c70caff87c710e659c5aaad0692e031d93ded (diff) | |
| download | frameworks_av-e6ca5b2d97f61e96af35fabed8c2ba352b8b5b99.zip frameworks_av-e6ca5b2d97f61e96af35fabed8c2ba352b8b5b99.tar.gz frameworks_av-e6ca5b2d97f61e96af35fabed8c2ba352b8b5b99.tar.bz2 | |
am 566c70ca: Guard against codecinfo overflow
* commit '566c70caff87c710e659c5aaad0692e031d93ded':
Guard against codecinfo overflow
Diffstat (limited to 'media/libstagefright/MetaData.cpp')
| -rw-r--r-- | media/libstagefright/MetaData.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/media/libstagefright/MetaData.cpp b/media/libstagefright/MetaData.cpp index 1daead7..cfc5f19 100644 --- a/media/libstagefright/MetaData.cpp +++ b/media/libstagefright/MetaData.cpp @@ -271,7 +271,12 @@ void MetaData::typed_data::setData( mType = type; allocateStorage(size); - memcpy(storage(), data, size); + void *dst = storage(); + if (!dst) { + ALOGE("Couldn't allocate %zu bytes for item", size); + return; + } + memcpy(dst, data, size); } void MetaData::typed_data::getData( |