| Index: chrome/utility/chrome_content_utility_client.cc
|
| diff --git a/chrome/utility/chrome_content_utility_client.cc b/chrome/utility/chrome_content_utility_client.cc
|
| index 1c79cdf4e55c426c0faf53aad0c6919618e1a411..536874d8ee1a5580c41d8a975746e58427c8640a 100644
|
| --- a/chrome/utility/chrome_content_utility_client.cc
|
| +++ b/chrome/utility/chrome_content_utility_client.cc
|
| @@ -207,9 +207,13 @@ void ChromeContentUtilityClient::PreSandboxStartup() {
|
| // static
|
| SkBitmap ChromeContentUtilityClient::DecodeImage(
|
| const std::vector<unsigned char>& encoded_data, bool shrink_to_fit) {
|
| - SkBitmap decoded_image = content::DecodeImage(&encoded_data[0],
|
| - gfx::Size(),
|
| - encoded_data.size());
|
| + SkBitmap decoded_image;
|
| + if (encoded_data.empty())
|
| + return decoded_image;
|
| +
|
| + decoded_image = content::DecodeImage(&encoded_data[0],
|
| + gfx::Size(),
|
| + encoded_data.size());
|
|
|
| int64_t struct_size = sizeof(ChromeUtilityHostMsg_DecodeImage_Succeeded);
|
| int64_t image_size = decoded_image.computeSize64();
|
|
|