From fc29f7acd1352efa97269b5f3856eb879d5cfd53 Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
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/LayerUpdateQueue.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'libs/hwui/LayerUpdateQueue.h')

diff --git a/libs/hwui/LayerUpdateQueue.h b/libs/hwui/LayerUpdateQueue.h
index 5b1a8543dd0d..38f3596d70df 100644
--- a/libs/hwui/LayerUpdateQueue.h
+++ b/libs/hwui/LayerUpdateQueue.h
@@ -19,6 +19,7 @@
 
 #include "Rect.h"
 #include "utils/Macros.h"
+#include <utils/StrongPointer.h>
 
 #include <vector>
 #include <unordered_map>
@@ -35,7 +36,7 @@ public:
         Entry(RenderNode* renderNode, const Rect& damage)
                 : renderNode(renderNode)
                 , damage(damage) {}
-        RenderNode* renderNode;
+        sp<RenderNode> renderNode;
         Rect damage;
     };
 
-- 
cgit v1.2.3-59-g8ed1b