corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1237201 part 4 - Handle Vector OOM in ipc/. r=billm

Browse Source
This commit is contained in:
Jan de Mooij
2016-01-14 15:19:24 +01:00
parent 2a788d03db
commit 9c9b64e570
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ipc/glue/MessageChannel.cpp
View File

@@ -226,7 +226,8 @@ public:
if (mThat.mCxxStackFrames.empty()) if (mThat.mCxxStackFrames.empty())
mThat.EnteredCxxStack(); mThat.EnteredCxxStack();
mThat.mCxxStackFrames.append(InterruptFrame(direction, msg)); if (!mThat.mCxxStackFrames.append(InterruptFrame(direction, msg)))
MOZ_CRASH();
const InterruptFrame& frame = mThat.mCxxStackFrames.back(); const InterruptFrame& frame = mThat.mCxxStackFrames.back();
@@ -778,7 +779,8 @@ MessageChannel::ProcessPendingRequests()
for (MessageQueue::iterator it = mPending.begin(); it != mPending.end(); ) { for (MessageQueue::iterator it = mPending.begin(); it != mPending.end(); ) {
Message &msg = *it; Message &msg = *it;
if (!ShouldDeferMessage(msg)) { if (!ShouldDeferMessage(msg)) {
toProcess.append(Move(msg)); if (!toProcess.append(Move(msg)))
MOZ_CRASH();
it = mPending.erase(it); it = mPending.erase(it);
continue; continue;
} }