wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1165792 - Wrap FallibleTArray functions with MOZ_ALWAYS_TRUE in MediaRawData.cpp. r=jya

Browse Source
This commit is contained in:
Birunthan Mohanathas 2015-05-18 13:50:34 -07:00
parent 38183d4ce4
commit fe4873e999
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dom/media/MediaData.cpp
View File

@ -3,6 +3,7 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "MediaData.h"
#include "MediaInfo.h"
#ifdef MOZ_OMX_DECODER
@ -505,8 +506,10 @@ MediaRawData::MediaRawData(const uint8_t* aData, size_t aSize)
if (!EnsureCapacity(aSize)) {
return;
}
mBuffer->AppendElements(aData, aSize);
mBuffer->AppendElements(RAW_DATA_ALIGNMENT);
// We ensure sufficient capacity above so this shouldn't fail.
MOZ_ALWAYS_TRUE(mBuffer->AppendElements(aData, aSize));
MOZ_ALWAYS_TRUE(mBuffer->AppendElements(RAW_DATA_ALIGNMENT));
mSize = aSize;
}
@ -525,8 +528,10 @@ MediaRawData::Clone() const
if (!s->EnsureCapacity(mSize)) {
return nullptr;
}
s->mBuffer->AppendElements(mData, mSize);
s->mBuffer->AppendElements(RAW_DATA_ALIGNMENT);
// We ensure sufficient capacity above so this shouldn't fail.
MOZ_ALWAYS_TRUE(s->mBuffer->AppendElements(mData, mSize));
MOZ_ALWAYS_TRUE(s->mBuffer->AppendElements(RAW_DATA_ALIGNMENT));
s->mSize = mSize;
}
return s.forget();
@ -555,7 +560,8 @@ MediaRawData::EnsureCapacity(size_t aSize)
if (shift == 0) {
// Nothing to do.
} else if (shift > 0) {
mBuffer->InsertElementsAt(oldpadding, shift);
// We ensure sufficient capacity above so this shouldn't fail.
MOZ_ALWAYS_TRUE(mBuffer->InsertElementsAt(oldpadding, shift));
} else {
mBuffer->RemoveElementsAt(mPadding, -shift);
}
@ -616,8 +622,10 @@ MediaRawDataWriter::SetSize(size_t aSize)
if (aSize > mTarget->mSize && !EnsureSize(aSize)) {
return false;
}
// Pad our buffer.
mBuffer->SetLength(aSize + mTarget->mPadding + RAW_DATA_ALIGNMENT);
// Pad our buffer. We ensure sufficient capacity above so this shouldn't fail.
MOZ_ALWAYS_TRUE(
mBuffer->SetLength(aSize + mTarget->mPadding + RAW_DATA_ALIGNMENT));
mTarget->mSize = mSize = aSize;
return true;
}
@ -628,7 +636,9 @@ MediaRawDataWriter::Prepend(const uint8_t* aData, size_t aSize)
if (!EnsureSize(aSize + mTarget->mSize)) {
return false;
}
mBuffer->InsertElementsAt(mTarget->mPadding, aData, aSize);
// We ensure sufficient capacity above so this shouldn't fail.
MOZ_ALWAYS_TRUE(mBuffer->InsertElementsAt(mTarget->mPadding, aData, aSize));
mTarget->mSize += aSize;
mSize = mTarget->mSize;
return true;
@ -640,7 +650,10 @@ MediaRawDataWriter::Replace(const uint8_t* aData, size_t aSize)
if (!EnsureSize(aSize)) {
return false;
}
mBuffer->ReplaceElementsAt(mTarget->mPadding, mTarget->mSize, aData, aSize);
// We ensure sufficient capacity above so this shouldn't fail.
MOZ_ALWAYS_TRUE(mBuffer->ReplaceElementsAt(mTarget->mPadding, mTarget->mSize,
aData, aSize));
mTarget->mSize = mSize = aSize;
return true;
}