summaryrefslogtreecommitdiff
path: root/libs/rs/rsAllocation.cpp
diff options
context:
space:
mode:
author Jason Sams <rjsams@android.com> 2009-11-02 15:06:49 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2009-11-02 15:06:49 -0800
commit766df995e30caa054cc25068e55f160c765590eb (patch)
treef03369bfc36db99994d8ffd6bf2da66ed42c203f /libs/rs/rsAllocation.cpp
parent96c178498c7c65388955cb8d2f8f11b0fac76c8d (diff)
parentd31b0e44af38594691440ba1ab5150b1a8f8480b (diff)
am d31b0e44: am 3bbb5e9a: Merge change Ib7a6c434 into eclair
Merge commit 'd31b0e44af38594691440ba1ab5150b1a8f8480b' into eclair-mr2-plus-aosp * commit 'd31b0e44af38594691440ba1ab5150b1a8f8480b': Fix some leaks. This fixes the major malloc memory leak in allApps. Still tracking some much more minor issues.
Diffstat (limited to 'libs/rs/rsAllocation.cpp')
-rw-r--r--libs/rs/rsAllocation.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/libs/rs/rsAllocation.cpp b/libs/rs/rsAllocation.cpp
index b7d1297feddf..2cbfe17d40a9 100644
--- a/libs/rs/rsAllocation.cpp
+++ b/libs/rs/rsAllocation.cpp
@@ -52,6 +52,8 @@ Allocation::Allocation(Context *rsc, const Type *type) : ObjectBase(rsc)
Allocation::~Allocation()
{
+ free(mPtr);
+ mPtr = NULL;
}
void Allocation::setCpuWritable(bool)