Index: chrome/browser/media_gallery/media_storage_util.cc |
diff --git a/chrome/browser/media_gallery/media_storage_util.cc b/chrome/browser/media_gallery/media_storage_util.cc |
index d41f13c508e3f5561c93e06c4a4c8962447cf971..a019656b22c372b7055604624152055c22204fb7 100644 |
--- a/chrome/browser/media_gallery/media_storage_util.cc |
+++ b/chrome/browser/media_gallery/media_storage_util.cc |
@@ -102,7 +102,8 @@ std::string MediaStorageUtil::MakeDeviceId(Type type, |
bool MediaStorageUtil::CrackDeviceId(const std::string& device_id, |
Type* type, std::string* unique_id) { |
size_t prefix_length = device_id.find_first_of(':'); |
- std::string prefix = device_id.substr(0, prefix_length); |
+ std::string prefix = prefix_length != std::string::npos ? |
+ device_id.substr(0, prefix_length + 1) : ""; |
Type found_type; |
if (prefix == kUsbMassStorageWithDCIMPrefix) { |