Check for null images in ImageFromCompressedData (#21891)

jason-simmons · web-flow · commit c2080ec72536 · 2020-10-15T16:57:02.000-07:00
diff --git a/lib/ui/painting/image_decoder.cc b/lib/ui/painting/image_decoder.cc
@@ -105,7 +105,8 @@ sk_sp<SkImage> ImageFromCompressedData(fml::RefPtr<ImageDescriptor> descriptor,
 
   if (!descriptor->should_resize(target_width, target_height)) {
     // No resizing requested. Just decode & rasterize the image.
-    return descriptor->image()->makeRasterImage();
+    sk_sp<SkImage> image = descriptor->image();
+    return image ? image->makeRasterImage() : nullptr;
   }
 
   const SkISize source_dimensions = descriptor->image_info().dimensions();

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,8 @@ sk_sp<SkImage> ImageFromCompressedData(fml::RefPtr<ImageDescriptor> descriptor,`
`105`	`105`
`106`	`106`	`if (!descriptor->should_resize(target_width, target_height)) {`
`107`	`107`	`// No resizing requested. Just decode & rasterize the image.`
`108`		`- return descriptor->image()->makeRasterImage();`
	`108`	`+ sk_sp<SkImage> image = descriptor->image();`
	`109`	`+ return image ? image->makeRasterImage() : nullptr;`
`109`	`110`	`}`
`110`	`111`
`111`	`112`	`const SkISize source_dimensions = descriptor->image_info().dimensions();`