From 2e6feed858c2b14b9083cf7d2b040a177dcb62ea Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Mon, 22 Jan 2018 15:27:20 -0500 Subject: Fix crash in ~GrContext BUG=804352, 804111 Change-Id: Ia8475a4a8a6de77438cde7df53931dc70c405b16 Reviewed-on: https://skia-review.googlesource.com/98341 Reviewed-by: Greg Daniel Commit-Queue: Robert Phillips --- src/gpu/GrContext.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp index eedb3e475f..f6c66db223 100644 --- a/src/gpu/GrContext.cpp +++ b/src/gpu/GrContext.cpp @@ -314,7 +314,9 @@ GrContext::~GrContext() { this->flush(); } - fDrawingManager->cleanup(); + if (fDrawingManager) { + fDrawingManager->cleanup(); + } for (int i = 0; i < fCleanUpData.count(); ++i) { (*fCleanUpData[i].fFunc)(this, fCleanUpData[i].fInfo); -- cgit v1.2.3