diff options
Diffstat (limited to 'chrome/browser/usb/usb_device_handle.cc')
| -rw-r--r-- | chrome/browser/usb/usb_device_handle.cc | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/chrome/browser/usb/usb_device_handle.cc b/chrome/browser/usb/usb_device_handle.cc index b6e54f4..56c3dc7 100644 --- a/chrome/browser/usb/usb_device_handle.cc +++ b/chrome/browser/usb/usb_device_handle.cc @@ -1,4 +1,4 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright (c) 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -127,7 +127,7 @@ void UsbDeviceHandle::TransferComplete(PlatformUsbTransferHandle handle) { DCHECK(ContainsKey(transfers_, handle)) << "Missing transfer completed"; Transfer* const transfer = &transfers_[handle]; - DCHECK(handle->actual_length >= 0) << "Negative actual length received"; + DCHECK_GE(handle->actual_length, 0) << "Negative actual length received"; size_t actual_length = static_cast<size_t>(std::max(handle->actual_length, 0)); @@ -272,9 +272,15 @@ bool UsbDeviceHandle::GetSerial(base::string16* serial) { size = libusb_get_string_descriptor( handle_, desc.iSerialNumber, langid[i], reinterpret_cast<unsigned char*>(&text[0]), sizeof(text)); - if (size < 0) + if (size <= 2) continue; - *serial = base::string16(text, size / 2); + if ((text[0] >> 8) != LIBUSB_DT_STRING) + continue; + if ((text[0] & 255) > size) + continue; + + size = size / 2 - 1; + *serial = base::string16(text + 1, size); return true; } return false; |