Mercurial > hg > openttd
changeset 18066:4871848c9435 draft
(svn r22881) -Fix (r22875): GCC warnings on 64bit systems.
| author | frosch <frosch@openttd.org> |
|---|---|
| date | Sat, 03 Sep 2011 12:45:45 +0000 |
| parents | 4e067847ddb6 |
| children | cbdb3230da31 |
| files | src/core/alloc_func.hpp src/pathfinder/npf/queue.cpp src/stdafx.h |
| diffstat | 3 files changed, 28 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/alloc_func.hpp +++ b/src/core/alloc_func.hpp @@ -23,6 +23,29 @@ void NORETURN ReallocError(size_t size); /** + * Checks whether allocating memory would overflow size_t. + * + * @param element_size Size of the structure to allocate. + * @param num_elements Number of elements to allocate. + */ +static inline void CheckAllocationConstraints(size_t element_size, size_t num_elements) +{ + if (num_elements > SIZE_MAX / element_size) MallocError(SIZE_MAX); +} + +/** + * Checks whether allocating memory would overflow size_t. + * + * @tparam T Structure to allocate. + * @param num_elements Number of elements to allocate. + */ +template <typename T> +static inline void CheckAllocationConstraints(size_t num_elements) +{ + CheckAllocationConstraints(sizeof(T), num_elements); +} + +/** * Simplified allocation function that allocates the specified number of * elements of the given type. It also explicitly casts it to the requested * type. @@ -43,7 +66,7 @@ if (num_elements == 0) return NULL; /* Ensure the size does not overflow. */ - if (num_elements > SIZE_MAX / sizeof(T)) MallocError(SIZE_MAX); + CheckAllocationConstraints<T>(num_elements); T *t_ptr = (T*)malloc(num_elements * sizeof(T)); if (t_ptr == NULL) MallocError(num_elements * sizeof(T)); @@ -100,7 +123,7 @@ } /* Ensure the size does not overflow. */ - if (num_elements > SIZE_MAX / sizeof(T)) MallocError(SIZE_MAX); + CheckAllocationConstraints<T>(num_elements); t_ptr = (T*)realloc(t_ptr, num_elements * sizeof(T)); if (t_ptr == NULL) ReallocError(num_elements * sizeof(T)); @@ -109,7 +132,7 @@ /** alloca() has to be called in the parent function, so define AllocaM() as a macro */ #define AllocaM(T, num_elements) \ - ((num_elements) > SIZE_MAX / sizeof(T) && (MallocError(SIZE_MAX), NULL), \ + (CheckAllocationConstraints<T>(num_elements), \ (T*)alloca((num_elements) * sizeof(T))) #endif /* ALLOC_FUNC_HPP */
--- a/src/pathfinder/npf/queue.cpp +++ b/src/pathfinder/npf/queue.cpp @@ -235,7 +235,7 @@ uint i; /* Ensure the size won't overflow. */ - assert(num_buckets < SIZE_MAX / (sizeof(*this->buckets) + sizeof(*this->buckets_in_use))); + CheckAllocationConstraints(sizeof(*this->buckets) + sizeof(*this->buckets_in_use), num_buckets); this->hash = hash; this->size = 0;