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

am 645434fb: Merge "Fix a leak in RefBase" into honeycomb-mr2

Browse Source 
* commit '645434fb4eff408698423d70904fb8fc709a5225':
  Fix a leak in RefBase
This commit is contained in:
Mathias Agopian 2011-06-08 19:30:47 -07:00 committed by Android Git Automerger
commit 58d6631e4d
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libs/utils/RefBase.cpp
View File

@ -418,21 +418,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)
{ {
@ -551,10 +553,12 @@ RefBase::RefBase()
RefBase::~RefBase() RefBase::~RefBase()
{ {
if ((mRefs->mFlags & OBJECT_LIFETIME_WEAK) == OBJECT_LIFETIME_WEAK) {
if (mRefs->mWeak == 0) { if (mRefs->mWeak == 0) {
delete mRefs; delete mRefs;
} }
} }
}
void RefBase::extendObjectLifetime(int32_t mode) void RefBase::extendObjectLifetime(int32_t mode)
{ {