aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRémi Verschelde2017-06-17 12:45:12 +0200
committerGitHub2017-06-17 12:45:12 +0200
commitff002ada5d0083093354ae0d55f87eb310b13ef2 (patch)
treee26c31d677dd906cf6e0082f1c95a9c68a96e5cd /drivers
parent9c44d72b3cbd40f5bfce1300d6f2222b2e5e46f9 (diff)
parent14e30c3faadd8d53f0b8005d5100b33fcae489c5 (diff)
downloadgodot-ff002ada5d0083093354ae0d55f87eb310b13ef2.tar.gz
godot-ff002ada5d0083093354ae0d55f87eb310b13ef2.tar.zst
godot-ff002ada5d0083093354ae0d55f87eb310b13ef2.zip
Diffstat (limited to 'drivers')
-rw-r--r--drivers/unix/memory_pool_static_malloc.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/unix/memory_pool_static_malloc.cpp b/drivers/unix/memory_pool_static_malloc.cpp
index ac26e230a..63057ef4b 100644
--- a/drivers/unix/memory_pool_static_malloc.cpp
+++ b/drivers/unix/memory_pool_static_malloc.cpp
@@ -67,10 +67,10 @@ void *MemoryPoolStaticMalloc::_alloc(size_t p_bytes, const char *p_description)
ERR_FAIL_COND_V(p_bytes == 0, 0);
- MutexLock lock(mutex);
-
#ifdef DEBUG_MEMORY_ENABLED
+ MutexLock lock(mutex);
+
size_t total;
#if defined(_add_overflow)
if (_add_overflow(p_bytes, sizeof(RingPtr), &total)) return NULL;
@@ -176,10 +176,10 @@ void *MemoryPoolStaticMalloc::_realloc(void *p_memory, size_t p_bytes) {
return NULL;
}
- MutexLock lock(mutex);
-
#ifdef DEBUG_MEMORY_ENABLED
+ MutexLock lock(mutex);
+
RingPtr *ringptr = (RingPtr *)p_memory;
ringptr--; /* go back an element to find the tingptr */
@@ -240,10 +240,10 @@ void MemoryPoolStaticMalloc::free(void *p_ptr) {
void MemoryPoolStaticMalloc::_free(void *p_ptr) {
- MutexLock lock(mutex);
-
#ifdef DEBUG_MEMORY_ENABLED
+ MutexLock lock(mutex);
+
if (p_ptr == 0) {
printf("**ERROR: STATIC ALLOC: Attempted free of NULL pointer.\n");
return;
@@ -298,7 +298,7 @@ void MemoryPoolStaticMalloc::_free(void *p_ptr) {
total_mem -= ringptr->size;
total_pointers--;
// catch more errors
- zeromem(ringptr, sizeof(RingPtr) + ringptr->size);
+ memset(ringptr, 0xEA, sizeof(RingPtr) + ringptr->size);
::free(ringptr); //just free that pointer
#else