diff options
| author | Marco Nelissen <marcone@google.com> | 2015-08-03 20:12:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-03 20:12:12 +0000 |
| commit | 99a1a6a79ca14554d2951101008348a9e2acbb8c (patch) | |
| tree | a5f988bb286a3ccf0e6731c15aef93c96d04db26 /media/libstagefright/MetaData.cpp | |
| parent | 0e35e4f902801b2a5375078d13aba1578de7e424 (diff) | |
| parent | e6ca5b2d97f61e96af35fabed8c2ba352b8b5b99 (diff) | |
| download | frameworks_av-99a1a6a79ca14554d2951101008348a9e2acbb8c.zip frameworks_av-99a1a6a79ca14554d2951101008348a9e2acbb8c.tar.gz frameworks_av-99a1a6a79ca14554d2951101008348a9e2acbb8c.tar.bz2 | |
am e6ca5b2d: am 566c70ca: Guard against codecinfo overflow
* commit 'e6ca5b2d97f61e96af35fabed8c2ba352b8b5b99':
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 74234a6..7d867b7 100644 --- a/media/libstagefright/MetaData.cpp +++ b/media/libstagefright/MetaData.cpp @@ -272,7 +272,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( |