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

Merge "Fix a memory leak." am: 1715678a89 am: 8f9c005fa9

Browse Source 
am: 85785b557a

Change-Id: I1e05b7d2793797cba915d0debd775b6b09b972cb
This commit is contained in:
George Burgess IV
2016-12-14 23:49:07 +00:00
committed by android-build-merger
parent 9e0f5d1abf 85785b557a
commit 9dfed40bd8
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media/mca/filterfw/native/core/shader_program.cpp
View File

@@ -1028,7 +1028,11 @@ bool ShaderProgram::SetAttributeValues(ProgramVar var,
attrib.values = data_cpy; attrib.values = data_cpy;
attrib.owned_data = data_cpy; // Marks this for deletion later on attrib.owned_data = data_cpy; // Marks this for deletion later on
return StoreAttribute(attrib); if (StoreAttribute(attrib))
return true;
// If storing this failed, then it won't be deleted on its own.
delete[] data_cpy;
return false;
} }
bool ShaderProgram::StoreAttribute(VertexAttrib attrib) { bool ShaderProgram::StoreAttribute(VertexAttrib attrib) {