Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 679e7f1d authored by John Reck's avatar John Reck
Browse files

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
parent 6ff61dbc

libs/hwui/RenderNode.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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);

        }