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 538239: Guard against async messages unblocking sync message waits. r=bent

Browse Source
This commit is contained in:
Chris Jones 2010-01-20 21:50:36 -06:00
parent e3c60ac47d
commit d42c00e1e9
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ipc/glue/SyncChannel.cpp
View File

@ -93,8 +93,16 @@ SyncChannel::Send(Message* msg, Message* reply)
FROM_HERE,
NewRunnableMethod(this, &SyncChannel::OnSend, msg));
// wait for the next sync message to arrive
WaitForNotify();
// NB: this is a do-while loop instead of a single wait because if
// there's a pending RPC out- or in-call below us, and the sync
// message handler on the other side sends us an async message,
// the IO thread will Notify() this thread of the async message.
// See https://bugzilla.mozilla.org/show_bug.cgi?id=538239.
do {
// wait for the next sync message to arrive
WaitForNotify();
} while(Connected() &&
mPendingReply != mRecvd.type() && !mRecvd.is_reply_error());
if (!Connected()) {
ReportConnectionError("SyncChannel");
@ -109,11 +117,13 @@ SyncChannel::Send(Message* msg, Message* reply)
// FIXME/cjones: real error handling
NS_ABORT_IF_FALSE(mRecvd.is_sync() && mRecvd.is_reply() &&
(mPendingReply == mRecvd.type() || mRecvd.is_reply_error()),
(mPendingReply == mRecvd.type() ||
mRecvd.is_reply_error()),
"unexpected sync message");
mPendingReply = 0;
*reply = mRecvd;
mRecvd = Message();
return true;
}