diff options
author | 2016-05-12 06:19:37 -0700 | |
---|---|---|
committer | 2016-05-12 06:19:37 -0700 | |
commit | a1b283345b27fef91908b104a30cb89e6fbdaade (patch) | |
tree | 981ab0ed2d16bc04a206262b650d157409bf6e6e /gm | |
parent | 7c73a53894927d222d4aceed96893daae8ea14f1 (diff) |
Fail gracefully if MakeRenderTarget fails
We recently started passing --preAbandonGpuContext when running DM on
valgrind, resulting in this call returning nullptr. We had not been
checking for it, so we crash. Already fixed one in crrev.com/1959173002,
and now we reach another one.
BUG=skia:5282
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1972933002
Review-Url: https://codereview.chromium.org/1972933002
Diffstat (limited to 'gm')
-rw-r--r-- | gm/image_shader.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gm/image_shader.cpp b/gm/image_shader.cpp index 214b05d80c..924199e6e7 100644 --- a/gm/image_shader.cpp +++ b/gm/image_shader.cpp @@ -38,6 +38,9 @@ static sk_sp<SkImage> make_texture(GrContext* ctx, SkPicture* pic, const SkImage return nullptr; } auto surface(SkSurface::MakeRenderTarget(ctx, SkBudgeted::kNo, info)); + if (!surface) { + return nullptr; + } surface->getCanvas()->clear(0); surface->getCanvas()->drawPicture(pic); return surface->makeImageSnapshot(); |