EmaMaker
/
tc-homework2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Ptr<T>::m_count memory leak in some places.

Gustavo J. A. M. Carneiro 2007-04-13 15:52:27 +01:00
parent f7017e22a0
commit a5d4a39e6d
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/core/ptr.h
View File

@ -130,39 +130,38 @@ Ptr<T>::DeallocCount (uint32_t *count)
template <typename T>
Ptr<T>::Ptr ()
: m_ptr (0),
m_count (Ptr::AllocCount ())
: m_ptr (0)
{}
template <typename T>
Ptr<T>::Ptr (T *ptr)
: m_ptr (ptr),
m_count (Ptr::AllocCount ())
: m_ptr (ptr)
{
if (m_ptr != 0)
{
m_count = Ptr::AllocCount ();
*m_count = 1;
}
}
template <typename T>
Ptr<T>::Ptr (Ptr const&o)
: m_ptr (o.m_ptr),
m_count (o.m_count)
: m_ptr (o.m_ptr)
{
if (m_ptr != 0)
{
m_count = o.m_count;
(*m_count)++;
}
}
template <typename T>
template <typename U>
Ptr<T>::Ptr (Ptr<U> const &o)
: m_ptr (o.m_ptr),
m_count (o.m_count)
: m_ptr (o.m_ptr)
{
if (m_ptr != 0)
{
m_count = o.m_count;
(*m_count)++;
}
}
@ -185,10 +184,8 @@ template <typename T>
Ptr<T> &
Ptr<T>::operator = (Ptr const& o)
{
if (o.m_ptr != 0)
{
(*(o.m_count))++;
}
if (&o == this)
return *this;
if (m_ptr != 0)
{
(*m_count)--;
@ -199,7 +196,11 @@ Ptr<T>::operator = (Ptr const& o)
}
}
m_ptr = o.m_ptr;
m_count = o.m_count;
if (m_ptr != 0)
{
m_count = o.m_count;
(*m_count)++;
}
return *this;
}
@ -246,10 +247,18 @@ template <typename T>
T *
Ptr<T>::Remove (void)
{
NS_ASSERT ((*m_count) == 1);
T *retval = m_ptr;
m_ptr = 0;
return retval;
if (m_ptr == 0)
{
return (T *) 0;
}
else
{
NS_ASSERT ((*m_count) == 1);
Ptr::DeallocCount (m_count);
T *retval = m_ptr;
m_ptr = 0;
return retval;
}
}
// non-member friend functions.