hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix semaphore segfault when tryWait'ing on invalid semaphore.

Browse source
This commit is contained in:
Thulinma 2017-05-23 21:21:21 +02:00
parent 108499bc58
commit 422c839ae2
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/shared_memory.cpp
View file

@ -222,6 +222,7 @@ namespace IPC {
///\brief Tries to wait for the semaphore, returns true if successful, false otherwise ///\brief Tries to wait for the semaphore, returns true if successful, false otherwise
bool semaphore::tryWait() { bool semaphore::tryWait() {
if (!(*this)){return false;}
int result; int result;
#if defined(__CYGWIN__) || defined(_WIN32) #if defined(__CYGWIN__) || defined(_WIN32)
result = WaitForSingleObject(mySem, 0);//wait at most 1ms result = WaitForSingleObject(mySem, 0);//wait at most 1ms
@ -237,6 +238,7 @@ namespace IPC {
///\brief Tries to wait for the semaphore for a single second, returns true if successful, false otherwise ///\brief Tries to wait for the semaphore for a single second, returns true if successful, false otherwise
bool semaphore::tryWaitOneSecond() { bool semaphore::tryWaitOneSecond() {
if (!(*this)){return false;}
int result; int result;
#if defined(__CYGWIN__) || defined(_WIN32) #if defined(__CYGWIN__) || defined(_WIN32)
result = WaitForSingleObject(mySem, 1000);//wait at most 1s result = WaitForSingleObject(mySem, 1000);//wait at most 1s