summaryrefslogtreecommitdiffstats
path: root/chrome/nacl
diff options
context:
space:
mode:
authordmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-30 22:41:53 +0000
committerdmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-30 22:41:53 +0000
commitfa9e3003a4304c441f0879c6742edb74ff2d10ee (patch)
treea7181d027c1c61e6dcd12308dabd8001e8a4c303 /chrome/nacl
parent3b1180ae17ab6745aa5c28124e0e362f9a10ba23 (diff)
downloadchromium_src-fa9e3003a4304c441f0879c6742edb74ff2d10ee.zip
chromium_src-fa9e3003a4304c441f0879c6742edb74ff2d10ee.tar.gz
chromium_src-fa9e3003a4304c441f0879c6742edb74ff2d10ee.tar.bz2
PPAPI/NaCl: Fix IPC proxy crash for reply messages
When I fixed the handles code to work on Windows, I broke it on POSIX. Not my finest work ;-). But further proof we need to turn on automated testing. BUG=116317 TBR=mseaborn@chromium.org Review URL: https://chromiumcodereview.appspot.com/10919012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154293 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/nacl')
-rw-r--r--chrome/nacl/nacl_ipc_adapter.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/nacl/nacl_ipc_adapter.cc b/chrome/nacl/nacl_ipc_adapter.cc
index 71b5cc56..ed0dd4d 100644
--- a/chrome/nacl/nacl_ipc_adapter.cc
+++ b/chrome/nacl/nacl_ipc_adapter.cc
@@ -176,10 +176,10 @@ class HandleConverter {
params;
if (!MessageType::ReadReplyParam(msg_, &params))
return false;
- out_msg->set_reply();
// If we need to rewrite the message (i.e., on Windows), we need to make
// sure we write the message id first.
if (out_msg) {
+ out_msg->set_reply();
int id = IPC::SyncMessage::GetMessageId(*msg_);
out_msg->WriteInt(id);
}