From 679e7f1dfc851f559c98ecfdfba7937dbc03c378 Mon Sep 17 00:00:00 2001 From: John Reck Date: Wed, 2 Aug 2017 16:11:43 -0700 Subject: Add check that layer size <= maxTextureSize Ensure that RenderNode fitsOnLayer() is true before assigning it a layer. Bug: 63814070 Test: repro steps in bug no longer crash Change-Id: I28bb2cb173a5efde24e2384f2606fea85b394ac8 --- libs/hwui/RenderNode.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libs/hwui/RenderNode.cpp') diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp index 55eeb7fa2073..61b3876cd095 100644 --- a/libs/hwui/RenderNode.cpp +++ b/libs/hwui/RenderNode.cpp @@ -241,7 +241,8 @@ void RenderNode::pushLayerUpdate(TreeInfo& info) { if (CC_LIKELY(layerType != LayerType::RenderLayer) || CC_UNLIKELY(!isRenderable()) || CC_UNLIKELY(properties().getWidth() == 0) - || CC_UNLIKELY(properties().getHeight() == 0)) { + || CC_UNLIKELY(properties().getHeight() == 0) + || CC_UNLIKELY(!properties().fitsOnLayer())) { if (CC_UNLIKELY(hasLayer())) { renderthread::CanvasContext::destroyLayer(this); } -- cgit v1.2.3-59-g8ed1b