Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1216748 - p2. Handle failed malloc in Metadata storage - r=rillian

Browse Source
This commit is contained in:
Gerald Squelart 2015-11-11 12:35:52 +01:00
parent fe2b536abd
commit e8a831bae2
2 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
media/libstagefright/frameworks/av/include/media/stagefright/MetaData.h
View File

@ -248,7 +248,7 @@ private:
return mSize <= sizeof(u.reservoir);
}
void allocateStorage(size_t size);
bool allocateStorage(size_t size);
void freeStorage();
void *storage() {

35
media/libstagefright/frameworks/av/media/libstagefright/MetaData.cpp
View File

@ -220,7 +220,7 @@ bool MetaData::findData(uint32_t key, uint32_t *type,
}
MetaData::typed_data::typed_data()
: mType(0),
: mType(TYPE_NONE),
mSize(0) {
}
@ -231,17 +231,19 @@ MetaData::typed_data::~typed_data() {
MetaData::typed_data::typed_data(const typed_data &from)
: mType(from.mType),
mSize(0) {
allocateStorage(from.mSize);
memcpy(storage(), from.storage(), mSize);
if (allocateStorage(from.mSize)) {
memcpy(storage(), from.storage(), mSize);
}
}
MetaData::typed_data &MetaData::typed_data::operator=(
const MetaData::typed_data &from) {
if (this != &from) {
clear();
mType = from.mType;
allocateStorage(from.mSize);
memcpy(storage(), from.storage(), mSize);
if (allocateStorage(from.mSize)) {
mType = from.mType;
memcpy(storage(), from.storage(), mSize);
}
}
return *this;
@ -250,16 +252,17 @@ MetaData::typed_data &MetaData::typed_data::operator=(
void MetaData::typed_data::clear() {
freeStorage();
mType = 0;
mType = TYPE_NONE;
}
void MetaData::typed_data::setData(
uint32_t type, const void *data, size_t size) {
clear();
mType = type;
allocateStorage(size);
memcpy(storage(), data, size);
if (allocateStorage(size)) {
mType = type;
memcpy(storage(), data, size);
}
}
void MetaData::typed_data::getData(
@ -269,14 +272,22 @@ void MetaData::typed_data::getData(
*data = storage();
}
void MetaData::typed_data::allocateStorage(size_t size) {
bool MetaData::typed_data::allocateStorage(size_t size) {
// Update mSize now, as it is needed by usesReservoir() below.
// (mSize will be reset if the allocation fails further below.)
mSize = size;
if (usesReservoir()) {
return;
return true;
}
u.ext_data = malloc(mSize);
if (!u.ext_data) {
mType = TYPE_NONE;
mSize = 0;
return false;
}
return true;
}
void MetaData::typed_data::freeStorage() {