Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-21 09:15:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1195977, part 4 - Enforce number of arguments more consistently. r=peterv

Browse Source 
The new check in ErrorResult::ReportErrorWithMessage() shouldn't be
needed and is just to protect against the possibility of another way
to construct messages being added.
This commit is contained in:
Andrew McCreight 2015-09-15 11:47:04 -07:00
parent 786ccb5a0e
commit 77be143629
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dom/bindings/BindingUtils.cpp
View File

@ -158,6 +158,11 @@ ThrowNoSetterArg(JSContext* aCx, prototypes::ID aProtoId)
struct ErrorResult::Message {
nsTArray<nsString> mArgs;
dom::ErrNum mErrorNumber;
bool HasCorrectNumberOfArguments()
{
return GetErrorArgCount(mErrorNumber) == mArgs.Length();
}
};
void
@ -206,6 +211,10 @@ ErrorResult::DeserializeMessage(const IPC::Message* aMsg, void** aIter)
!ReadParam(aMsg, aIter, &readMessage->mErrorNumber)) {
return false;
}
if (!readMessage->HasCorrectNumberOfArguments()) {
return false;
}
MOZ_ASSERT(!mHasMessage);
mMessage = readMessage.forget();
#ifdef DEBUG
@ -239,6 +248,7 @@ ErrorResult::ReportErrorWithMessage(JSContext* aCx)
MOZ_ASSERT(mHasMessage);
Message* message = mMessage;
MOZ_RELEASE_ASSERT(message->HasCorrectNumberOfArguments());
const uint32_t argCount = message->mArgs.Length();
const char16_t* args[JS::MaxNumErrorArguments + 1];
for (uint32_t i = 0; i < argCount; ++i) {