diff options
| author | michi_cc <michi_cc@openttd.org> | 2011-09-02 20:54:51 +0000 |
|---|---|---|
| committer | michi_cc <michi_cc@openttd.org> | 2011-09-02 20:54:51 +0000 |
| commit | f227e90c248b37fe50c9e48a08a1bb976c782e9f (patch) | |
| tree | 08d88d27ff581ebc89f0f16acb35d156ad6a84be /src/misc/fixedsizearray.hpp | |
| parent | 65637d89411e96dee5ee9fc2e8a7b3805c4162a2 (diff) | |
| download | openttd-f227e90c248b37fe50c9e48a08a1bb976c782e9f.tar.xz | |
(svn r22875) -Codechange: Add some asserts and checks to better prevent overflow of the argument to malloc. (monoid)
Diffstat (limited to 'src/misc/fixedsizearray.hpp')
| -rw-r--r-- | src/misc/fixedsizearray.hpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/misc/fixedsizearray.hpp b/src/misc/fixedsizearray.hpp index 8b82373fa..a6f4d0c42 100644 --- a/src/misc/fixedsizearray.hpp +++ b/src/misc/fixedsizearray.hpp @@ -53,6 +53,9 @@ public: /** Default constructor. Preallocate space for items and header, then initialize header. */ FixedSizeArray() { + /* Ensure the size won't overflow. */ + assert_compile(C < (SIZE_MAX - HeaderSize) / Tsize); + /* allocate block for header + items (don't construct items) */ data = (T*)((MallocT<byte>(HeaderSize + C * Tsize)) + HeaderSize); SizeRef() = 0; // initial number of items |