From 5bf11bb98f5dbe278c257355d24c181237abd68c Mon Sep 17 00:00:00 2001 From: John Reck Date: Tue, 25 Mar 2014 10:22:09 -0700 Subject: Add missing null check Bug: 13635394 mDisplayListData can be null, make sure to check for that before trying to walk through the children list in updateProperties Change-Id: I8d97b1656c1acf47b7c5df8a8771b0f30907261d --- libs/hwui/RenderNode.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'libs/hwui/RenderNode.cpp') diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp index 62a9d71a5dc2..d3daec8e7dd3 100644 --- a/libs/hwui/RenderNode.cpp +++ b/libs/hwui/RenderNode.cpp @@ -99,9 +99,11 @@ void RenderNode::updateProperties() { mProperties = mStagingProperties; } - for (size_t i = 0; i < mDisplayListData->children.size(); i++) { - RenderNode* childNode = mDisplayListData->children[i]->mDisplayList; - childNode->updateProperties(); + if (mDisplayListData) { + for (size_t i = 0; i < mDisplayListData->children.size(); i++) { + RenderNode* childNode = mDisplayListData->children[i]->mDisplayList; + childNode->updateProperties(); + } } } -- cgit v1.2.3-59-g8ed1b