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

Common/MemArena: mmap returns MAP_FAILED on error, not nullptr.

This commit is contained in:
Admiral H. Curtiss 2023-09-07 13:59:33 +02:00
parent a20bb3e05b
commit c14bc6ea4c
No known key found for this signature in database
GPG Key ID: F051B4C4044F33FB
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -156,7 +156,7 @@ void* LazyMemoryRegion::Create(size_t size)
ASSERT(!m_memory); ASSERT(!m_memory);
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) if (memory == MAP_FAILED)
{ {
NOTICE_LOG_FMT(MEMMAP, "Memory allocation of {} bytes failed.", size); NOTICE_LOG_FMT(MEMMAP, "Memory allocation of {} bytes failed.", size);
return nullptr; return nullptr;

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

@ -122,7 +122,7 @@ void* LazyMemoryRegion::Create(size_t size)
ASSERT(!m_memory); ASSERT(!m_memory);
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) if (memory == MAP_FAILED)
{ {
NOTICE_LOG_FMT(MEMMAP, "Memory allocation of {} bytes failed.", size); NOTICE_LOG_FMT(MEMMAP, "Memory allocation of {} bytes failed.", size);
return nullptr; return nullptr;