From 403634c0e1050a6ef2083682bc6684a35eb02f0b Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Wed, 19 Apr 2017 17:52:43 +0300 Subject: [PATCH] Fixed crash caused by failure to allocate memory block of very special size Allocation of 810 FState objects (32400 bytes in total) could be performed in MSVC x64 build but worked in 32-bit version This fixes https://mantis.zdoom.org/view.php?id=602 --- src/memarena.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/memarena.cpp b/src/memarena.cpp index 0a90d9e16..af59c81c7 100644 --- a/src/memarena.cpp +++ b/src/memarena.cpp @@ -255,7 +255,7 @@ FMemArena::Block *FMemArena::AddBlock(size_t size) void FMemArena::Block::Reset() { - Avail = RoundPointer(this + sizeof(*this)); + Avail = RoundPointer(reinterpret_cast(this) + sizeof(*this)); } //==========================================================================