fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Memory] Close shared memory FD and properly handle its invalid value

Browse Source
This commit is contained in:
Triang3l
2020-11-22 14:17:37 +03:00
parent 432369ae84
commit 86ae42919d
7 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/xenia/base/memory_posix.cc
View File

@@ -86,19 +86,19 @@ FileMappingHandle CreateFileMappingHandle(const std::filesystem::path& path,
assert_always();
return nullptr;
}
oflag |= O_CREAT;
auto full_path = "/" / path;
int ret = shm_open(full_path.c_str(), oflag, 0777);
if (ret > 0) {
ftruncate64(ret, length);
if (ret < 0) {
return kFileMappingHandleInvalid;
}
return ret <= 0 ? nullptr : reinterpret_cast<FileMappingHandle>(ret);
ftruncate64(ret, length);
return ret;
}
void CloseFileMappingHandle(FileMappingHandle handle,
const std::filesystem::path& path) {
close(handle);
auto full_path = "/" / path;
shm_unlink(full_path.c_str());
}
@@ -106,8 +106,8 @@ void CloseFileMappingHandle(FileMappingHandle handle,
void* MapFileView(FileMappingHandle handle, void* base_address, size_t length,
PageAccess access, size_t file_offset) {
uint32_t prot = ToPosixProtectFlags(access);
return mmap64(base_address, length, prot, MAP_PRIVATE | MAP_ANONYMOUS,
reinterpret_cast<intptr_t>(handle), file_offset);
return mmap64(base_address, length, prot, MAP_PRIVATE | MAP_ANONYMOUS, handle,
file_offset);
}
bool UnmapFileView(FileMappingHandle handle, void* base_address,