From 5715452768c00b9d523d4dd462929ccf63da523a Mon Sep 17 00:00:00 2001 From: lqs Date: Tue, 13 Oct 2020 13:19:04 +0800 Subject: [PATCH] Fix crash on image decoding error --- lib/ui/painting/image_decoder.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/ui/painting/image_decoder.cc b/lib/ui/painting/image_decoder.cc index a2de0185bb285..6b7f00e7b4478 100644 --- a/lib/ui/painting/image_decoder.cc +++ b/lib/ui/painting/image_decoder.cc @@ -105,7 +105,11 @@ sk_sp ImageFromCompressedData(fml::RefPtr descriptor, if (!descriptor->should_resize(target_width, target_height)) { // No resizing requested. Just decode & rasterize the image. - return descriptor->image()->makeRasterImage(); + auto image = descriptor->image(); + if (!image) { + return nullptr; + } + return image->makeRasterImage(); } const SkISize source_dimensions = descriptor->image_info().dimensions();