jyapayne/moonlight-common-c
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix unsafe modification of the peer variable during shutdown

Browse source
This commit is contained in:
Cameron Gutman 2016-04-18 16:36:45 -04:00
commit 8846493eb4
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/ControlStream.c
View file

@ -292,6 +292,12 @@ static int sendMessageEnet(short ptype, short paylen, const void* payload) {
LC_ASSERT(ServerMajorVersion >= 5); LC_ASSERT(ServerMajorVersion >= 5);
// We may be trying to disconnect, so our peer could be gone.
// This check is safe because we're guaranteed to be holding enetMutex.
if (peer == NULL) {
return 0;
}
packet = malloc(sizeof(*packet) + paylen); packet = malloc(sizeof(*packet) + paylen);
if (packet == NULL) { if (packet == NULL) {
return 0; return 0;
@ -570,6 +576,7 @@ int stopControlStream(void) {
if (peer != NULL) { if (peer != NULL) {
PltLockMutex(&enetMutex); PltLockMutex(&enetMutex);
enet_peer_disconnect_now(peer, 0); enet_peer_disconnect_now(peer, 0);
peer = NULL;
PltUnlockMutex(&enetMutex); PltUnlockMutex(&enetMutex);
} }
@ -586,7 +593,6 @@ int stopControlStream(void) {
PltCloseThread(&lossStatsThread); PltCloseThread(&lossStatsThread);
PltCloseThread(&invalidateRefFramesThread); PltCloseThread(&invalidateRefFramesThread);
peer = NULL;
if (client != NULL) { if (client != NULL) {
enet_host_destroy(client); enet_host_destroy(client);
client = NULL; client = NULL;