drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a leak in RefBase (DO NOT MERGE)

Browse Source 
this bug was introduced recently. it caused RefBase's weakref_impl
structure to be leaked for every RefBase object (about 20 bytes).

Change-Id: Ia9b155fbfa643ef72cfb8129e96260a3b806a78c
This commit is contained in:
Mathias Agopian
2011-06-08 16:05:30 -07:00
parent 66040bbb08
commit 19974eccdb
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libs/utils/RefBase.cpp
View File

@ -373,21 +373,23 @@ void RefBase::weakref_type::decWeak(const void* id)
if (c != 1) return; if (c != 1) return;
if ((impl->mFlags&OBJECT_LIFETIME_WEAK) != OBJECT_LIFETIME_WEAK) { if ((impl->mFlags&OBJECT_LIFETIME_WEAK) != OBJECT_LIFETIME_WEAK) {
if (impl->mStrong == INITIAL_STRONG_VALUE) if (impl->mStrong == INITIAL_STRONG_VALUE) {
if (impl->mBase) if (impl->mBase) {
impl->mBase->destroy(); impl->mBase->destroy();
else { }
} else {
// LOGV("Freeing refs %p of old RefBase %p\n", this, impl->mBase); // LOGV("Freeing refs %p of old RefBase %p\n", this, impl->mBase);
delete impl; delete impl;
} }
} else { } else {
impl->mBase->onLastWeakRef(id); impl->mBase->onLastWeakRef(id);
if ((impl->mFlags&OBJECT_LIFETIME_FOREVER) != OBJECT_LIFETIME_FOREVER) { if ((impl->mFlags&OBJECT_LIFETIME_FOREVER) != OBJECT_LIFETIME_FOREVER) {
if (impl->mBase) if (impl->mBase) {
impl->mBase->destroy(); impl->mBase->destroy();
} }
} }
} }
}
bool RefBase::weakref_type::attemptIncStrong(const void* id) bool RefBase::weakref_type::attemptIncStrong(const void* id)
{ {
@ -508,12 +510,12 @@ RefBase::RefBase()
RefBase::~RefBase() RefBase::~RefBase()
{ {
// LOGV("Destroying RefBase %p (refs %p)\n", this, mRefs); if ((mRefs->mFlags & OBJECT_LIFETIME_WEAK) == OBJECT_LIFETIME_WEAK) {
if (mRefs->mWeak == 0) { if (mRefs->mWeak == 0) {
// LOGV("Freeing refs %p of old RefBase %p\n", mRefs, this);
delete mRefs; delete mRefs;
} }
} }
}
void RefBase::extendObjectLifetime(int32_t mode) void RefBase::extendObjectLifetime(int32_t mode)
{ {