diff options
author | yexo <yexo@openttd.org> | 2010-09-03 23:04:02 +0000 |
---|---|---|
committer | yexo <yexo@openttd.org> | 2010-09-03 23:04:02 +0000 |
commit | 0decc3e09433dd480862dbe608c04fec26c00795 (patch) | |
tree | 458140b31e1bab88aaef544b70e6cc00f4434037 /src/core | |
parent | 9a0033cbf6ac68d002b561dc04c097126b5ef729 (diff) | |
download | openttd-0decc3e09433dd480862dbe608c04fec26c00795.tar.xz |
(svn r20731) -Fix (r20739): SmallVector did not have an assignment operator, causing invalid memory reads / double free
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/smallvec_type.hpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/core/smallvec_type.hpp b/src/core/smallvec_type.hpp index d64f4a744..89b12d5f5 100644 --- a/src/core/smallvec_type.hpp +++ b/src/core/smallvec_type.hpp @@ -36,12 +36,20 @@ protected: public: SmallVector() : data(NULL), items(0), capacity(0) { } - template<uint X> + template <uint X> SmallVector(const SmallVector<T, X> &other) : data(NULL), items(0), capacity(0) { MemCpyT<T>(this->Append(other.Length()), other.Begin(), other.Length()); } + template <uint X> + SmallVector &operator=(const SmallVector<T, X> &other) + { + this->Reset(); + MemCpyT<T>(this->Append(other.Length()), other.Begin(), other.Length()); + return *this; + } + ~SmallVector() { free(this->data); |