scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2024-11-28 18:45:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed alloc/free mismatch with tinystl::string.

Browse source
This commit is contained in:
bkaradzic 2013-10-06 19:32:35 -07:00
parent a863185e57
commit 5f35341abf
2 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
examples/common/font/font_manager.cpp
View file

@ -10,12 +10,13 @@
#include <edtaa3/edtaa3func.cpp>
#include <wchar.h> // wcslen
#include "font_manager.h"
#include "../cube_atlas.h"
#include <tinystl/allocator.h>
#include <tinystl/unordered_map.h>
namespace stl = tinystl;
#include "font_manager.h"
#include "../cube_atlas.h"
struct FTHolder
{
FT_Library library;

18
src/bgfx.cpp
View file

@ -54,7 +54,10 @@ namespace bgfx
void TinyStlAllocator::static_deallocate(void* _ptr, size_t /*_bytes*/)
{
BX_FREE(g_allocator, _ptr);
if (NULL != _ptr)
{
BX_FREE(g_allocator, _ptr);
}
}
#endif // BGFX_CONFIG_USE_TINYSTL
@ -142,6 +145,7 @@ namespace bgfx
#if BGFX_CONFIG_DEBUG
{
bx::LwMutexScope scope(m_mutex);
BX_CHECK(m_numBlocks > 0, "Number of blocks is 0. Possible alloc/free mismatch?");
--m_numBlocks;
}
#endif // BGFX_CONFIG_DEBUG
@ -166,12 +170,12 @@ namespace bgfx
return ::realloc(_ptr, _size);
}
void checkLeaks() const
void checkLeaks()
{
BX_WARN(0 == m_numBlocks, "MEMORY LEAK: %d (max: %d)", m_numBlocks, m_maxBlocks);
}
private:
protected:
#if BGFX_CONFIG_DEBUG
bx::LwMutex m_mutex;
uint32_t m_numBlocks;
@ -634,6 +638,8 @@ namespace bgfx
void init(CallbackI* _callback, bx::ReallocatorI* _allocator)
{
BX_TRACE("Init...");
if (NULL != _allocator)
{
g_allocator = _allocator;
@ -661,10 +667,14 @@ namespace bgfx
// On NaCl and iOS renderer is on the main thread.
s_ctx->init(!BX_PLATFORM_NACL && !BX_PLATFORM_IOS);
BX_TRACE("Init complete.");
}
void shutdown()
{
BX_TRACE("Shutdown...");
BGFX_CHECK_MAIN_THREAD();
s_ctx->shutdown();
@ -810,8 +820,6 @@ namespace bgfx
void Context::shutdown()
{
BX_TRACE("Shutdown");
getCommandBuffer(CommandBuffer::RendererShutdownBegin);
frame();