mumble: prevent rejected clients from crashing a future connecting cl…

…ient
citizenfx · Feb 15, 2019 · a29aa79 · a29aa79
1 parent db6cd33
commit a29aa79
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/code/components/voip-server-mumble/src/messagehandler.cpp b/code/components/voip-server-mumble/src/messagehandler.cpp
@@ -140,8 +140,6 @@ void Mh_handle_message(client_t *client, message_t *msg)
 			goto disconnect;
 		}*/
 
-		client->authenticated = true;
-
 		client_itr = NULL;
 		while (Client_iterate(&client_itr) != NULL) {
 			if (!IS_AUTH(client_itr))
@@ -182,6 +180,8 @@ void Mh_handle_message(client_t *client, message_t *msg)
 			goto disconnect;
 		}
 
+		client->authenticated = true;
+
 		/* Name */
 		client->username = strdup(msg->payload.authenticate->username().c_str());
 

diff --git a/code/components/voip-server-mumble/src/server.cpp b/code/components/voip-server-mumble/src/server.cpp
@@ -420,6 +420,12 @@ static InitFunction initFunction([]()
 						client->rxcount = client->msgsize = 0;
 					}
 				}
+
+				// close stream if shutting down
+				if (client->shutdown_wait)
+				{
+					client->stream->Close();
+				}
 			});
 
 			stream->SetCloseCallback([=]()