Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Avoid segfault when converting no-op ColorFilter to ImageFilter #37596

Merged
merged 1 commit into from
Nov 14, 2022
Merged

Avoid segfault when converting no-op ColorFilter to ImageFilter #37596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions lib/ui/painting/image_filter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,11 @@ void ImageFilter::initMatrix(const tonic::Float64List& matrix4,

void ImageFilter::initColorFilter(ColorFilter* colorFilter) {
FML_DCHECK(colorFilter);
filter_ =
std::make_shared<DlColorFilterImageFilter>(colorFilter->dl_filter());
auto dl_filter = colorFilter->dl_filter();
// Skia may return nullptr if the colorfilter is a no-op.
if (dl_filter) {
filter_ = std::make_shared<DlColorFilterImageFilter>(dl_filter);
}
}

void ImageFilter::initComposeFilter(ImageFilter* outer, ImageFilter* inner) {
Expand Down
3 changes: 3 additions & 0 deletions testing/dart/canvas_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,9 @@ void testNoCrashes() {
testCanvas((Canvas canvas) => canvas.drawVertices(Vertices(VertexMode.triangles, <Offset>[],
indices: <int>[]), BlendMode.screen, paint));
testCanvas((Canvas canvas) => canvas.drawVertices(Vertices(VertexMode.triangles, <Offset>[])..dispose(), BlendMode.screen, paint));

// Regression test for https://github.com/flutter/flutter/issues/115143
testCanvas((Canvas canvas) => canvas.drawPaint(Paint()..imageFilter = const ColorFilter.mode(Color(0x00000000), BlendMode.xor)));
});
}

Expand Down