summaryrefslogtreecommitdiffstats
path: root/mojo
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-18 23:05:04 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-18 23:05:04 +0000
commit168a15cb1ac0f810c0372f86a02fb564e25d5424 (patch)
treeb7d1d274ae7b7f3e0b02160c255a4e03ae480634 /mojo
parent481fcb6a9bdd980a253105a40e510fb2be368434 (diff)
downloadchromium_src-168a15cb1ac0f810c0372f86a02fb564e25d5424.zip
chromium_src-168a15cb1ac0f810c0372f86a02fb564e25d5424.tar.gz
chromium_src-168a15cb1ac0f810c0372f86a02fb564e25d5424.tar.bz2
Mojo: Fix MojoReadMessage() with *num_handles == 0.
R=davemoore@chromium.org, davemoore Review URL: https://codereview.chromium.org/75243005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235837 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo')
-rw-r--r--mojo/system/core_impl.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/mojo/system/core_impl.cc b/mojo/system/core_impl.cc
index 6075149..1416501 100644
--- a/mojo/system/core_impl.cc
+++ b/mojo/system/core_impl.cc
@@ -322,7 +322,7 @@ MojoResult CoreImpl::ReadMessage(
// Easy case: won't receive any handles.
if (!num_handles || *num_handles == 0)
- return dispatcher->ReadMessage(bytes, num_bytes, 0, NULL, flags);
+ return dispatcher->ReadMessage(bytes, num_bytes, NULL, num_handles, flags);
std::vector<scoped_refptr<Dispatcher> > dispatchers;
MojoResult rv = dispatcher->ReadMessage(bytes, num_bytes,