Fix recent OpenEnclave + snmalloc Release build

This commit is contained in:
Amaury Chamayou
2020-02-27 13:12:10 +00:00
parent 8723ae2443
commit bd5702fa05
4 changed files with 7 additions and 5 deletions

View File

@@ -8,6 +8,7 @@
#include "baseslab.h"
#include "sizeclass.h"
#include <string.h>
#include <new>
namespace snmalloc

View File

@@ -4,7 +4,7 @@
#ifdef OPEN_ENCLAVE
extern "C" const void* __oe_get_heap_base();
extern "C" const void* __oe_get_heap_end();
extern "C" void* oe_memset(void* p, int c, size_t size);
extern "C" void* oe_memset_s(void* p, size_t p_size, int c, size_t size);
extern "C" void oe_abort();
namespace snmalloc
@@ -54,7 +54,7 @@ namespace snmalloc
template<bool page_aligned = false>
void zero(void* p, size_t size) noexcept
{
oe_memset(p, 0, size);
oe_memset_s(p, size, 0, size);
}
};
}

View File

@@ -17,9 +17,9 @@ extern "C" const void* __oe_get_heap_end()
return oe_end;
}
extern "C" void* oe_memset(void* p, int c, size_t size)
extern "C" void* oe_memset_s(void* p, size_t p_size, int c, size_t size)
{
std::cout << "Memset " << p << " - " << size << std::endl;
std::cout << "Memset " << p << " (" << p_size << ") - " << size << std::endl;
return memset(p, c, size);
}

View File

@@ -17,8 +17,9 @@ extern "C" const void* __oe_get_heap_end()
return oe_end;
}
extern "C" void* oe_memset(void* p, int c, size_t size)
extern "C" void* oe_memset_s(void* p, size_t p_size, int c, size_t size)
{
(void) p_size;
return memset(p, c, size);
}