Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2025-01-22 16:25:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MemMap: Fix object leak on fallocate() failure

Browse source
This commit is contained in:
Stenzek 2024-08-05 12:39:17 +10:00
parent 79bb5f079c
commit 6c5ffba18e
No known key found for this signature in database
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/common/memmap.cpp
View file

@ -644,7 +644,8 @@ void* MemMap::CreateSharedMemory(const char* name, size_t size, Error* error)
} }
// we're not going to be opening this mapping in other processes, so remove the file // we're not going to be opening this mapping in other processes, so remove the file
shm_unlink(name); if (!is_anonymous)
shm_unlink(name);
#endif #endif
// use fallocate() to ensure we don't SIGBUS later on. // use fallocate() to ensure we don't SIGBUS later on.
@ -652,6 +653,9 @@ void* MemMap::CreateSharedMemory(const char* name, size_t size, Error* error)
if (fallocate(fd, 0, 0, static_cast<off_t>(size)) < 0) if (fallocate(fd, 0, 0, static_cast<off_t>(size)) < 0)
{ {
Error::SetErrno(error, TinyString::from_format("fallocate({}) failed: ", size), errno); Error::SetErrno(error, TinyString::from_format("fallocate({}) failed: ", size), errno);
close(fd);
if (!is_anonymous)
shm_unlink(name);
return nullptr; return nullptr;
} }
#else #else
@ -659,6 +663,9 @@ void* MemMap::CreateSharedMemory(const char* name, size_t size, Error* error)
if (ftruncate(fd, static_cast<off_t>(size)) < 0) if (ftruncate(fd, static_cast<off_t>(size)) < 0)
{ {
Error::SetErrno(error, TinyString::from_format("ftruncate({}) failed: ", size), errno); Error::SetErrno(error, TinyString::from_format("ftruncate({}) failed: ", size), errno);
close(fd);
if (!is_anonymous)
shm_unlink(name);
return nullptr; return nullptr;
} }
#endif #endif