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

ipc: remove possible memory corruption due to strcat on provided pointer

This commit is contained in:
Gauvain 'GovanifY' Roussel-Tarbouriech 2021-03-29 14:58:45 +02:00 committed by refractionpcsx2
parent 4a2482e950
commit 80cd65d347
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pcsx2/IPC.cpp
View File

@ -76,17 +76,22 @@ SocketIPC::SocketIPC(SysCoreThread* vm, unsigned int slot)
} }
#else #else
char* runtime_dir = nullptr;
#ifdef __APPLE__ #ifdef __APPLE__
char* runtime_dir = std::getenv("TMPDIR"); runtime_dir = std::getenv("TMPDIR");
#else #else
char* runtime_dir = std::getenv("XDG_RUNTIME_DIR"); runtime_dir = std::getenv("XDG_RUNTIME_DIR");
#endif #endif
// fallback in case macOS or other OSes don't implement the XDG base // fallback in case macOS or other OSes don't implement the XDG base
// spec // spec
if (runtime_dir == NULL) if (runtime_dir == nullptr)
m_socket_name = (char*)"/tmp/" IPC_EMULATOR_NAME ".sock"; m_socket_name = (char*)"/tmp/" IPC_EMULATOR_NAME ".sock";
else else
m_socket_name = strcat(runtime_dir, "/" IPC_EMULATOR_NAME ".sock"); {
m_socket_name = new char[strlen(runtime_dir) + strlen("/" IPC_EMULATOR_NAME ".sock") + 1];
strcpy(m_socket_name, runtime_dir);
strcat(m_socket_name, "/" IPC_EMULATOR_NAME ".sock");
}
if (slot != IPC_DEFAULT_SLOT) if (slot != IPC_DEFAULT_SLOT)
{ {