Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am cb5d644f: Merge "Workaround possible use after delete" into jb-mr2-dev

Browse Source 
* commit 'cb5d644fb8956962b6a89f8d384b16819af5fdf9':
  Workaround possible use after delete
This commit is contained in:
Chris Craik
2013-06-11 14:09:41 -07:00
committed by Android Git Automerger
parent 0a2ff8db43 cb5d644fb8
commit 8cb26c099d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libs/hwui/DisplayList.cpp
View File

@@ -63,6 +63,7 @@ void DisplayList::destroyDisplayListDeferred(DisplayList* displayList) {
void DisplayList::clearResources() {
mDisplayListData = NULL;
mSize = 0; // TODO: shouldn't be needed, WAR possible use after delete
mClipRectOp = NULL;
mSaveLayerOp = NULL;
@@ -479,7 +480,7 @@ void DisplayList::replay(ReplayStateStruct& replayStruct, const int level) {
*/
template <class T>
void DisplayList::iterate(OpenGLRenderer& renderer, T& handler, const int level) {
if (mSize == 0 || mAlpha <= 0) {
if (mSize == 0 || mAlpha <= 0 || CC_UNLIKELY(!mSaveOp)) { // TODO: shouldn't need mSaveOp check
DISPLAY_LIST_LOGD("%*sEmpty display list (%p, %s)", level * 2, "", this, mName.string());
return;
}