commit fc29f7acd1352efa97269b5f3856eb879d5cfd53
author John Reck <jreck@google.com> Thu Mar 02 13:23:16 2017 -0800
committer John Reck <jreck@google.com> Thu Mar 02 13:30:15 2017 -0800
tree bca5e58917a15e5f3ee37aed0dd3823c8e941c80
parent d632305e376c899f6d5cbcaa441350c310b9fe44

Fix potential use-after-free in LayerUpdateQueue

Change-Id: I090af2191576175b165a9db574a80123c16f0778
Fixes: 26548204
Test: Builds & hwui unit tests pass

libs/hwui/LayerUpdateQueue.h

diff --git a/libs/hwui/LayerUpdateQueue.h b/libs/hwui/LayerUpdateQueue.h
index 5b1a854..38f3596 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 @@
         Entry(RenderNode* renderNode, const Rect& damage)
                 : renderNode(renderNode)
                 , damage(damage) {}
-        RenderNode* renderNode;
+        sp<RenderNode> renderNode;
         Rect damage;
     };