summaryrefslogtreecommitdiffstats
path: root/device
diff options
context:
space:
mode:
authorreillyg <reillyg@chromium.org>2016-03-23 16:31:07 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-23 23:35:13 +0000
commit6fd81948bcee67251be3311bdd96de9a7cdcdd84 (patch)
tree78acdc4b7fa9f49210b6f353163106bf418df7da /device
parent1ba5ac190a8a46a6ac5b8f1b06bcb66ec6eb967e (diff)
downloadchromium_src-6fd81948bcee67251be3311bdd96de9a7cdcdd84.zip
chromium_src-6fd81948bcee67251be3311bdd96de9a7cdcdd84.tar.gz
chromium_src-6fd81948bcee67251be3311bdd96de9a7cdcdd84.tar.bz2
Set interface_number in USB to Mojo type converter.
The type converter for device::UsbInterfaceDescriptor neglected to set interface_number on the new device::usb::InterfaceInfo. Aside from the wrong data being exposed to apps now that Blink does more sanity checking of API calls this breaks everything. BUG=None Review URL: https://codereview.chromium.org/1825303003 Cr-Commit-Position: refs/heads/master@{#382970}
Diffstat (limited to 'device')
-rw-r--r--device/usb/mojo/type_converters.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/device/usb/mojo/type_converters.cc b/device/usb/mojo/type_converters.cc
index e22b58f..a2daeaa 100644
--- a/device/usb/mojo/type_converters.cc
+++ b/device/usb/mojo/type_converters.cc
@@ -185,6 +185,7 @@ TypeConverter<mojo::Array<device::usb::InterfaceInfoPtr>,
// This is the first time we're seeing an alternate with this interface
// number, so add a new InterfaceInfo to the array and map the number.
auto info = device::usb::InterfaceInfo::New();
+ info->interface_number = interfaces[i].interface_number;
iter = interface_map
.insert(
std::make_pair(interfaces[i].interface_number, info.get()))