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

Merge "Merge "Fix a memory leak." am: 1715678a89 am: 8f9c005fa9 am: 85785b557a am: 9dfed40bd8"

Browse Source
This commit is contained in:
Android Build Merger (Role)
2016-12-15 00:31:45 +00:00
committed by Android (Google) Code Review
parent d7098afd5d 56489bd5d0
commit a76d260835
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.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) {