mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r20731) -Fix (r20739): SmallVector did not have an assignment operator, causing invalid memory reads / double free

This commit is contained in:
yexo 2010-09-03 23:04:02 +00:00
parent 9a0033cbf6
commit 0decc3e094
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/smallvec_type.hpp
View File

@ -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);

2
src/landscape.cpp
View File

@ -638,7 +638,7 @@ CommandCost CmdClearArea(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
for (int x = sx; x <= ex; ++x) {
for (int y = sy; y <= ey; ++y) {
SmallVector<TileArea, 1> object_areas = _cleared_object_areas;
SmallVector<TileArea, 1> object_areas(_cleared_object_areas);
CommandCost ret = DoCommand(TileXY(x, y), 0, 0, flags & ~DC_EXEC, CMD_LANDSCAPE_CLEAR);
_cleared_object_areas = object_areas;
if (ret.Failed()) {