Skip to content

Commit 278836e

Browse files
chethaaseAndroid (Google) Code Review
authored andcommitted
Merge "Fix garbage deref with DisplayList property structures"
2 parents a2d68c9 + 491189f commit 278836e

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

libs/hwui/DisplayListRenderer.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,9 @@ void DisplayList::outputLogBuffer(int fd) {
9191
fflush(file);
9292
}
9393

94-
DisplayList::DisplayList(const DisplayListRenderer& recorder) {
94+
DisplayList::DisplayList(const DisplayListRenderer& recorder) :
95+
mTransformMatrix(NULL), mTransformCamera(NULL), mTransformMatrix3D(NULL) {
96+
9597
initFromDisplayListRenderer(recorder);
9698
}
9799

@@ -124,9 +126,6 @@ void DisplayList::initProperties() {
124126
mWidth = 0;
125127
mHeight = 0;
126128
mPivotExplicitlySet = false;
127-
mTransformMatrix = NULL;
128-
mTransformCamera = NULL;
129-
mTransformMatrix3D = NULL;
130129
mCaching = false;
131130
}
132131

0 commit comments

Comments
 (0)