diff options
| -rw-r--r-- | src/misc/autoptr.hpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/misc/autoptr.hpp b/src/misc/autoptr.hpp index edb7c10c6..8b0d920f5 100644 --- a/src/misc/autoptr.hpp +++ b/src/misc/autoptr.hpp @@ -81,8 +81,16 @@ public: /** assignment operator */ 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; + if (m_p != NULL) src.m_p = NULL; + + if (p != NULL) { + /* Now we can safely delete the old one. */ + delete p; + } return *this; } |