From 17ab971e85a72eecf55a8be7a2e33088dd61ec95 Mon Sep 17 00:00:00 2001
From: MangosArentLiterature
 <58055358+MangosArentLiterature@users.noreply.github.com>
Date: Mon, 31 May 2021 20:50:46 -0500
Subject: [PATCH] Fix command UID crash

Fix several commands targeting clients by UID crashing the server by not properly checking if the client they want exists.
---
 core/src/commands/area.cpp       |  4 +++
 core/src/commands/messaging.cpp  | 44 ++++++++++++++++++++++++++++++++
 core/src/commands/moderation.cpp | 34 ++++++++++++++++++++++++
 core/src/commands/music.cpp      | 10 ++++++++
 4 files changed, 92 insertions(+)

diff --git a/core/src/commands/area.cpp b/core/src/commands/area.cpp
index 6a7e84c..0a2219c 100644
--- a/core/src/commands/area.cpp
+++ b/core/src/commands/area.cpp
@@ -82,6 +82,10 @@ void AOClient::cmdUnCM(int argc, QStringList argv)
             return;
         }
         AOClient* target = server->getClientByID(uid);
+        if (target == nullptr) {
+            sendServerMessage("No client with that ID found.");
+            return;
+        }
         target->sendServerMessage("You have been unCMed by a moderator.");
     }
     else {
diff --git a/core/src/commands/messaging.cpp b/core/src/commands/messaging.cpp
index c5cf7e0..c3d5cbb 100644
--- a/core/src/commands/messaging.cpp
+++ b/core/src/commands/messaging.cpp
@@ -189,6 +189,11 @@ void AOClient::cmdGimp(int argc, QStringList argv)
 
     AOClient* target = server->getClientByID(uid);
 
+    if (target == nullptr) {
+        sendServerMessage("No client with that ID found.");
+        return;
+    }
+
     if (target->is_gimped)
         sendServerMessage("That player is already gimped!");
     else {
@@ -209,6 +214,11 @@ void AOClient::cmdUnGimp(int argc, QStringList argv)
 
     AOClient* target = server->getClientByID(uid);
 
+    if (target == nullptr) {
+        sendServerMessage("No client with that ID found.");
+        return;
+    }
+
     if (!(target->is_gimped))
         sendServerMessage("That player is not gimped!");
     else {
@@ -229,6 +239,11 @@ void AOClient::cmdDisemvowel(int argc, QStringList argv)
 
     AOClient* target = server->getClientByID(uid);
 
+    if (target == nullptr) {
+        sendServerMessage("No client with that ID found.");
+        return;
+    }
+
     if (target->is_disemvoweled)
         sendServerMessage("That player is already disemvoweled!");
     else {
@@ -249,6 +264,11 @@ void AOClient::cmdUnDisemvowel(int argc, QStringList argv)
 
     AOClient* target = server->getClientByID(uid);
 
+    if (target == nullptr) {
+        sendServerMessage("No client with that ID found.");
+        return;
+    }
+
     if (!(target->is_disemvoweled))
         sendServerMessage("That player is not disemvoweled!");
     else {
@@ -269,6 +289,11 @@ void AOClient::cmdShake(int argc, QStringList argv)
 
     AOClient* target = server->getClientByID(uid);
 
+    if (target == nullptr) {
+        sendServerMessage("No client with that ID found.");
+        return;
+    }
+
     if (target->is_shaken)
         sendServerMessage("That player is already shaken!");
     else {
@@ -289,6 +314,11 @@ void AOClient::cmdUnShake(int argc, QStringList argv)
 
     AOClient* target = server->getClientByID(uid);
 
+    if (target == nullptr) {
+        sendServerMessage("No client with that ID found.");
+        return;
+    }
+
     if (!(target->is_shaken))
         sendServerMessage("That player is not shaken!");
     else {
@@ -329,6 +359,11 @@ void AOClient::cmdCharCurse(int argc, QStringList argv)
 
     AOClient* target = server->getClientByID(uid);
 
+    if (target == nullptr) {
+        sendServerMessage("No client with that ID found.");
+        return;
+    }
+
     if (target->is_charcursed) {
         sendServerMessage("That player is already charcursed!");
         return;
@@ -379,6 +414,11 @@ void AOClient::cmdUnCharCurse(int argc, QStringList argv)
 
     AOClient* target = server->getClientByID(uid);
 
+    if (target == nullptr) {
+        sendServerMessage("No client with that ID found.");
+        return;
+    }
+
     if (!target->is_charcursed) {
         sendServerMessage("That player is not charcursed!");
         return;
@@ -408,6 +448,10 @@ void AOClient::cmdCharSelect(int argc, QStringList argv)
             return;
 
         AOClient* target = server->getClientByID(target_id);
+
+        if (target == nullptr)
+            return;
+
         target->changeCharacter(-1);
         target->sendPacket("DONE");
     }
diff --git a/core/src/commands/moderation.cpp b/core/src/commands/moderation.cpp
index 31777c5..842e98a 100644
--- a/core/src/commands/moderation.cpp
+++ b/core/src/commands/moderation.cpp
@@ -215,6 +215,11 @@ void AOClient::cmdMute(int argc, QStringList argv)
 
     AOClient* target = server->getClientByID(uid);
 
+    if (target == nullptr) {
+        sendServerMessage("No client with that ID found.");
+        return;
+    }
+
     if (target->is_muted)
         sendServerMessage("That player is already muted!");
     else {
@@ -235,6 +240,11 @@ void AOClient::cmdUnMute(int argc, QStringList argv)
 
     AOClient* target = server->getClientByID(uid);
 
+    if (target == nullptr) {
+        sendServerMessage("No client with that ID found.");
+        return;
+    }
+
     if (!target->is_muted)
         sendServerMessage("That player is not muted!");
     else {
@@ -255,6 +265,11 @@ void AOClient::cmdOocMute(int argc, QStringList argv)
 
     AOClient* target = server->getClientByID(uid);
 
+    if (target == nullptr) {
+        sendServerMessage("No client with that ID found.");
+        return;
+    }
+
     if (target->is_ooc_muted)
         sendServerMessage("That player is already OOC muted!");
     else {
@@ -275,6 +290,11 @@ void AOClient::cmdOocUnMute(int argc, QStringList argv)
 
     AOClient* target = server->getClientByID(uid);
 
+    if (target == nullptr) {
+        sendServerMessage("No client with that ID found.");
+        return;
+    }
+
     if (!target->is_ooc_muted)
         sendServerMessage("That player is not OOC muted!");
     else {
@@ -295,6 +315,11 @@ void AOClient::cmdBlockWtce(int argc, QStringList argv)
 
     AOClient* target = server->getClientByID(uid);
 
+    if (target == nullptr) {
+        sendServerMessage("No client with that ID found.");
+        return;
+    }
+
     if (target->is_wtce_blocked)
         sendServerMessage("That player is already judge blocked!");
     else {
@@ -315,6 +340,11 @@ void AOClient::cmdUnBlockWtce(int argc, QStringList argv)
 
     AOClient* target = server->getClientByID(uid);
 
+    if (target == nullptr) {
+        sendServerMessage("No client with that ID found.");
+        return;
+    }
+
     if (!target->is_wtce_blocked)
         sendServerMessage("That player is not judge blocked!");
     else {
@@ -429,6 +459,10 @@ void AOClient::cmdKickUid(int argc, QStringList argv)
     }
 
     AOClient* target = server->getClientByID(uid);
+    if (target == nullptr) {
+        sendServerMessage("No client with that ID found.");
+        return;
+    }
     target->sendPacket("KK", {reason});
     target->socket->close();
     sendServerMessage("Kicked client with UID " + argv[0] + " for reason: " + reason);
diff --git a/core/src/commands/music.cpp b/core/src/commands/music.cpp
index e11648d..4b1fb8d 100644
--- a/core/src/commands/music.cpp
+++ b/core/src/commands/music.cpp
@@ -54,6 +54,11 @@ void AOClient::cmdBlockDj(int argc, QStringList argv)
 
     AOClient* target = server->getClientByID(uid);
 
+    if (target == nullptr) {
+        sendServerMessage("No client with that ID found.");
+        return;
+    }
+
     if (target->is_dj_blocked)
         sendServerMessage("That player is already DJ blocked!");
     else {
@@ -74,6 +79,11 @@ void AOClient::cmdUnBlockDj(int argc, QStringList argv)
 
     AOClient* target = server->getClientByID(uid);
 
+    if (target == nullptr) {
+        sendServerMessage("No client with that ID found.");
+        return;
+    }
+
     if (!target->is_dj_blocked)
         sendServerMessage("That player is not DJ blocked!");
     else {