Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(670)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/usb/usb_device.cc

Issue 12283027: Merge 182128 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1410/src/
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/api/usb/usb_api.cc ('k') | chrome/test/data/extensions/api_test/usb/invalid_length_transfer/test.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/usb/usb_device.cc
===================================================================
--- chrome/browser/usb/usb_device.cc (revision 182892)
+++ chrome/browser/usb/usb_device.cc (working copy)
@@ -277,10 +277,8 @@
CheckDevice();
const uint64 total_length = packets * packet_length;
- if (total_length > length) {
- callback.Run(USB_TRANSFER_LENGTH_SHORT, NULL, 0);
- return;
- }
+ CHECK(packets <= length && total_length <= length) <<
+ "transfer length is too small";
struct libusb_transfer* const transfer = libusb_alloc_transfer(packets);
const uint8 new_endpoint = ConvertTransferDirection(direction) | endpoint;
« no previous file with comments | « chrome/browser/extensions/api/usb/usb_api.cc ('k') | chrome/test/data/extensions/api_test/usb/invalid_length_transfer/test.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698