From fc29f7acd1352efa97269b5f3856eb879d5cfd53 Mon Sep 17 00:00:00 2001 From: John Reck Date: Thu, 2 Mar 2017 13:23:16 -0800 Subject: Fix potential use-after-free in LayerUpdateQueue Change-Id: I090af2191576175b165a9db574a80123c16f0778 Fixes: 26548204 Test: Builds & hwui unit tests pass --- libs/hwui/FrameBuilder.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libs/hwui/FrameBuilder.cpp') diff --git a/libs/hwui/FrameBuilder.cpp b/libs/hwui/FrameBuilder.cpp index 35ff635930ab..1b57e290c198 100644 --- a/libs/hwui/FrameBuilder.cpp +++ b/libs/hwui/FrameBuilder.cpp @@ -78,7 +78,7 @@ void FrameBuilder::deferLayers(const LayerUpdateQueue& layers) { // Render all layers to be updated, in order. Defer in reverse order, so that they'll be // updated in the order they're passed in (mLayerBuilders are issued to Renderer in reverse) for (int i = layers.entries().size() - 1; i >= 0; i--) { - RenderNode* layerNode = layers.entries()[i].renderNode; + RenderNode* layerNode = layers.entries()[i].renderNode.get(); // only schedule repaint if node still on layer - possible it may have been // removed during a dropped frame, but layers may still remain scheduled so // as not to lose info on what portion is damaged -- cgit v1.2.3-59-g8ed1b