Skip to content

Commit f396418

Browse files
Do not access members after calling ClearDartWrapper (flutter#20465)
1 parent 4a91bc8 commit f396418

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

lib/ui/painting/canvas.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,10 +486,10 @@ void Canvas::drawShadow(const CanvasPath* path,
486486
}
487487

488488
void Canvas::Invalidate() {
489+
canvas_ = nullptr;
489490
if (dart_wrapper()) {
490491
ClearDartWrapper();
491492
}
492-
canvas_ = nullptr;
493493
}
494494

495495
} // namespace flutter

lib/ui/painting/image.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ Dart_Handle CanvasImage::toByteData(int format, Dart_Handle callback) {
3737
}
3838

3939
void CanvasImage::dispose() {
40-
ClearDartWrapper();
4140
image_.reset();
41+
ClearDartWrapper();
4242
}
4343

4444
size_t CanvasImage::GetAllocationSize() const {

lib/ui/painting/picture.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ Dart_Handle Picture::toImage(uint32_t width,
5656
}
5757

5858
void Picture::dispose() {
59-
ClearDartWrapper();
6059
picture_.reset();
60+
ClearDartWrapper();
6161
}
6262

6363
size_t Picture::GetAllocationSize() const {

0 commit comments

Comments
 (0)