mirror of
https://github.com/Xaymar/obs-StreamFX
synced 2024-10-24 05:42:39 +00:00
01bf510a28
The custom allocator occasionally returned memory that was aligned, but did not have enough space to store the actual size due to a calculation error in the size. This resulted in situations where allocating 1022 bytes would give you a writable buffer of only 1020 bytes or less, or also known as writing into unknown memory, possibly even the heap. This is now fixed by doubling the padding used. Additionally it will now default to using standard allocators, which should work better and rely on the Compiler.
68 lines
2 KiB
C++
68 lines
2 KiB
C++
/*
|
|
* Modern effects for a modern Streamer
|
|
* Copyright (C) 2017 Michael Fabian Dirks
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
|
*/
|
|
|
|
#include "util-memory.h"
|
|
#include <cstdlib>
|
|
#define USE_STD_ALLOC_FREE
|
|
|
|
void* util::malloc_aligned(size_t align, size_t size) {
|
|
#ifdef USE_STD_ALLOC_FREE
|
|
#if defined(_MSC_VER)
|
|
#ifdef DEBUG
|
|
return _aligned_malloc_dbg(size, align);
|
|
#else
|
|
return _aligned_malloc(size, align);
|
|
#endif
|
|
#else
|
|
return aligned_malloc(align, size);
|
|
#endif
|
|
#else
|
|
// Ensure that we have space for the pointer and the data.
|
|
size_t asize = aligned_offset(align, size + (sizeof(void*) * 2));
|
|
|
|
// Allocate memory and store integer representation of pointer.
|
|
void* ptr = malloc(asize);
|
|
|
|
// Calculate actual aligned position
|
|
intptr_t ptr_off = aligned_offset(align, reinterpret_cast<size_t>(ptr) + sizeof(void*));
|
|
|
|
// Store actual pointer at ptr_off - sizeof(void*).
|
|
*reinterpret_cast<intptr_t*>(ptr_off - sizeof(void*)) = reinterpret_cast<intptr_t>(ptr);
|
|
|
|
// Return aligned pointer
|
|
return reinterpret_cast<void*>(ptr_off);
|
|
#endif
|
|
}
|
|
|
|
void util::free_aligned(void* mem) {
|
|
#ifdef USE_STD_ALLOC_FREE
|
|
#if defined(_MSC_VER)
|
|
#ifdef DEBUG
|
|
_aligned_free_dbg(mem);
|
|
#else
|
|
_aligned_free(mem);
|
|
#endif
|
|
#else
|
|
free(mem);
|
|
#endif
|
|
#else
|
|
void* ptr = reinterpret_cast<void*>(*reinterpret_cast<intptr_t*>(static_cast<char*>(mem) - sizeof(void*)));
|
|
free(ptr);
|
|
#endif
|
|
}
|