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

Unified Diff: device/usb/usb_device_android.cc

Issue 2914453002: Check UsbDevice string fields for null. (Closed)
Patch Set: Use ScopedJavaLocalRef as a local var type. Created 3 years, 7 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/usb/usb_device_android.cc
diff --git a/device/usb/usb_device_android.cc b/device/usb/usb_device_android.cc
index 72b496f44ed28e1094c39bedb80ec689d1d1b713..35be3b026a638723460dc43ce659db184b49dc37 100644
--- a/device/usb/usb_device_android.cc
+++ b/device/usb/usb_device_android.cc
@@ -35,12 +35,18 @@ scoped_refptr<UsbDeviceAndroid> UsbDeviceAndroid::Create(
device_version = Java_ChromeUsbDevice_getDeviceVersion(env, wrapper);
base::string16 manufacturer_string, product_string, serial_number;
if (base::android::BuildInfo::GetInstance()->sdk_int() >= 21) {
- manufacturer_string = ConvertJavaStringToUTF16(
- env, Java_ChromeUsbDevice_getManufacturerName(env, wrapper));
- product_string = ConvertJavaStringToUTF16(
- env, Java_ChromeUsbDevice_getProductName(env, wrapper));
- serial_number = ConvertJavaStringToUTF16(
- env, Java_ChromeUsbDevice_getSerialNumber(env, wrapper));
+ ScopedJavaLocalRef<jstring> manufacturer_jstring =
+ Java_ChromeUsbDevice_getManufacturerName(env, wrapper);
+ if (!manufacturer_jstring.is_null())
+ manufacturer_string = ConvertJavaStringToUTF16(env, manufacturer_jstring);
+ ScopedJavaLocalRef<jstring> product_jstring =
+ Java_ChromeUsbDevice_getProductName(env, wrapper);
+ if (!product_jstring.is_null())
+ product_string = ConvertJavaStringToUTF16(env, product_jstring);
+ ScopedJavaLocalRef<jstring> serial_jstring =
+ Java_ChromeUsbDevice_getSerialNumber(env, wrapper);
+ if (!serial_jstring.is_null())
+ serial_number = ConvertJavaStringToUTF16(env, serial_jstring);
}
return make_scoped_refptr(new UsbDeviceAndroid(
env, service,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698