ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Common/MemArena: A zero-byte allocation is invalid.

This commit is contained in:
Admiral H. Curtiss 2023-09-07 14:41:24 +02:00
parent c14bc6ea4c
commit 422bc7a627
No known key found for this signature in database
GPG Key ID: F051B4C4044F33FB
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/Common/MemArenaAndroid.cpp
View File

@ -155,6 +155,9 @@ void* LazyMemoryRegion::Create(size_t size)
{ {
ASSERT(!m_memory); ASSERT(!m_memory);
if (size == 0)
return nullptr;
void* memory = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); void* memory = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
if (memory == MAP_FAILED) if (memory == MAP_FAILED)
{ {

3
Source/Core/Common/MemArenaUnix.cpp
View File

@ -121,6 +121,9 @@ void* LazyMemoryRegion::Create(size_t size)
{ {
ASSERT(!m_memory); ASSERT(!m_memory);
if (size == 0)
return nullptr;
void* memory = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); void* memory = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
if (memory == MAP_FAILED) if (memory == MAP_FAILED)
{ {

3
Source/Core/Common/MemArenaWin.cpp
View File

@ -445,6 +445,9 @@ void* LazyMemoryRegion::Create(size_t size)
{ {
ASSERT(!m_memory); ASSERT(!m_memory);
if (size == 0)
return nullptr;
void* memory = VirtualAlloc(nullptr, size, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE); void* memory = VirtualAlloc(nullptr, size, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE);
if (!memory) if (!memory)
{ {