merge from dev

This commit is contained in:
Daan 2025-01-10 09:50:30 -08:00
commit 191ea046e4
20 changed files with 269 additions and 60 deletions

View file

@ -40,9 +40,9 @@ static void test_thread_local(); // issue #944
static void test_mixed1(); // issue #942
static void test_stl_allocators();
#if _WIN32
#if x_WIN32
#include "main-override-dep.h"
static void test_dep(); // issue #981: test overriding in another DLL
static void test_dep(); // issue #981: test overriding in another DLL
#else
static void test_dep() { };
#endif
@ -53,7 +53,7 @@ int main() {
test_mixed1();
test_dep();
//test_std_string();
//test_thread_local();
// heap_thread_free_huge();
@ -117,8 +117,10 @@ static void various_tests() {
t->~Test();
delete[] tbuf;
#if _WIN32
const char* ptr = ::_Getdays(); // test _base overrid
free((void*)ptr);
#endif
}
class Static {
@ -148,7 +150,7 @@ static bool test_stl_allocator1() {
struct some_struct { int i; int j; double z; };
#if _WIN32
#if x_WIN32
static void test_dep()
{
TestAllocInDll t;
@ -417,7 +419,7 @@ void large_alloc(void)
// issue #372
static void fail_aslr() {
size_t sz = (4ULL << 40); // 4TiB
size_t sz = (size_t)(4ULL << 40); // 4TiB
void* p = malloc(sz);
printf("pointer p: %p: area up to %p\n", p, (uint8_t*)p + sz);
*(int*)0x5FFFFFFF000 = 0; // should segfault