mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r10647) -Fix: AutoPtrT::operator =() didn't delete old object

release/0.6
KUDr 2007-07-21 14:01:12 +00:00
parent 43ddd64817
commit d3c20d65bd
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/misc/autoptr.hpp
View File

@ -81,8 +81,16 @@ public:
/** assignment operator */ /** assignment operator */
FORCEINLINE AutoPtrT& operator = (const AutoPtrT& src) FORCEINLINE AutoPtrT& operator = (const AutoPtrT& src)
{ {
/* Save original pointer and replace it with the given one to avoid recursive calls. */
T* p = m_p;
m_p = src.m_p; m_p = src.m_p;
if (m_p != NULL) src.m_p = NULL; if (m_p != NULL) src.m_p = NULL;
if (p != NULL) {
/* Now we can safely delete the old one. */
delete p;
}
return *this; return *this;
} }