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

Commit a6809b06 authored by Hans Boehm's avatar Hans Boehm Committed by android-build-merger
Browse files

Merge "Check sp<>::clear() for data races" am: 59cd8237 

am: 39ca2792

Change-Id: Ib0e36940d360fbd3e883af3ac2f4c682ad73b684
parents bb1ebf57 39ca2792

libutils/include/utils/StrongPointer.h

+4 −2
Original line number Diff line number Diff line
@@ -228,8 +228,10 @@ void sp<T>::force_set(T* other) { 


template<typename T>

void sp<T>::clear() {

    if (m_ptr) {

        m_ptr->decStrong(this);

    T* oldPtr(*const_cast<T* volatile*>(&m_ptr));

    if (oldPtr) {

        oldPtr->decStrong(this);

        if (oldPtr != *const_cast<T* volatile*>(&m_ptr)) sp_report_race();

        m_ptr = nullptr;

    }

}