ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Fix a leak in RefBase" into honeycomb-mr2

Browse Source
This commit is contained in:
Mathias Agopian 2011-06-08 19:28:39 -07:00 committed by Android (Google) Code Review
commit ee8e9af975
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libs/utils/RefBase.cpp
View File

@ -418,18 +418,20 @@ void RefBase::weakref_type::decWeak(const void* id)
if (c != 1) return;
if ((impl->mFlags&OBJECT_LIFETIME_WEAK) != OBJECT_LIFETIME_WEAK) {
if (impl->mStrong == INITIAL_STRONG_VALUE)
if (impl->mBase)
if (impl->mStrong == INITIAL_STRONG_VALUE) {
if (impl->mBase) {
impl->mBase->destroy();
else {
}
} else {
// LOGV("Freeing refs %p of old RefBase %p\n", this, impl->mBase);
delete impl;
}
} else {
impl->mBase->onLastWeakRef(id);
if ((impl->mFlags&OBJECT_LIFETIME_FOREVER) != OBJECT_LIFETIME_FOREVER) {
if (impl->mBase)
if (impl->mBase) {
impl->mBase->destroy();
}
}
}
}
@ -551,8 +553,10 @@ RefBase::RefBase()
RefBase::~RefBase()
{
if (mRefs->mWeak == 0) {
delete mRefs;
if ((mRefs->mFlags & OBJECT_LIFETIME_WEAK) == OBJECT_LIFETIME_WEAK) {
if (mRefs->mWeak == 0) {
delete mRefs;
}
}
}