Commit 86174fe2 authored by Marco Buttu's avatar Marco Buttu
Browse files

Fix #143: delete the resource only once it has been released

parent 7066c2d8
Loading
Loading
Loading
Loading
+7 −3
Original line number Diff line number Diff line
@@ -90,6 +90,8 @@ WPServoImpl::WPServoImpl(
WPServoImpl::~WPServoImpl() {
    AUTO_TRACE("WPServoImpl::~WPServoImpl()"); 

    bool remove_instance_counter = false;

    try {
        pthread_mutex_lock(&destr_mutex); 
        if(m_instance_counter != NULL) {
@@ -117,11 +119,13 @@ WPServoImpl::~WPServoImpl() {
                if(m_cmdPos_list != NULL) {
                    delete m_cmdPos_list;
                }
                if(m_instance_counter != NULL) {
                    delete m_instance_counter;
                }
                remove_instance_counter = true;
            }
            secure_ptr.Release();

            if(remove_instance_counter) {
                delete m_instance_counter;
            }
        }

        if (m_cdb_ptr) {