Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19974ecc authored by Mathias Agopian's avatar Mathias Agopian
Browse files

Fix a leak in RefBase (DO NOT MERGE) 

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
parent 66040bbb

libs/utils/RefBase.cpp

+11 −9
Original line number Diff line number Diff line
@@ -373,21 +373,23 @@ 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();

            }

        }

    }

}



bool RefBase::weakref_type::attemptIncStrong(const void* id)

{
@@ -508,12 +510,12 @@ 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) {

//        LOGV("Freeing refs %p of old RefBase %p\n", mRefs, this);

            delete mRefs;

        }

    }

}



void RefBase::extendObjectLifetime(int32_t mode)

{