From 883ac9051126deeded681a2997f1b93d550f4e09 Mon Sep 17 00:00:00 2001
From: Salanto <62221668+Salanto@users.noreply.github.com>
Date: Wed, 15 Jun 2022 22:54:38 +0200
Subject: [PATCH] Fix segfault due to insufficient jukebox state validation.

---
 core/include/area_data.h    |  7 +++++++
 core/src/area_data.cpp      |  5 +++++
 core/src/commands/music.cpp | 15 +++++++++++++--
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/core/include/area_data.h b/core/include/area_data.h
index 3735132..902ee8f 100644
--- a/core/include/area_data.h
+++ b/core/include/area_data.h
@@ -321,6 +321,13 @@ class AreaData : public QObject
      */
     bool isjukeboxEnabled() const;
 
+    /**
+     * @brief Returns the amount of songs pending in the Jukebox queue.
+     *
+     * @return Remaining entries of the queue as int.
+     */
+    int getJukeboxQueueSize() const;
+
     /**
      * @brief Locks the area, setting it to LOCKED.
      */
diff --git a/core/src/area_data.cpp b/core/src/area_data.cpp
index d1110fc..0bbf8a0 100644
--- a/core/src/area_data.cpp
+++ b/core/src/area_data.cpp
@@ -160,6 +160,11 @@ bool AreaData::isjukeboxEnabled() const
     return m_jukebox;
 }
 
+int AreaData::getJukeboxQueueSize() const
+{
+    return m_jukebox_queue.size();
+}
+
 void AreaData::lock()
 {
     m_locked = LockStatus::LOCKED;
diff --git a/core/src/commands/music.cpp b/core/src/commands/music.cpp
index 9f63e79..0752473 100644
--- a/core/src/commands/music.cpp
+++ b/core/src/commands/music.cpp
@@ -218,6 +218,17 @@ void AOClient::cmdJukeboxSkip(int argc, QStringList argv)
     if (!m_showname.isEmpty()) {
         l_name = m_showname;
     }
-    server->getAreaById(m_current_area)->switchJukeboxSong();
-    sendServerMessageArea(l_name + " has forced a skip. Playing the next available song.");
+
+    AreaData *l_area = server->getAreaById(m_current_area);
+
+    if (l_area->isjukeboxEnabled()) {
+        if (l_area->getJukeboxQueueSize() >= 1) {
+            l_area->switchJukeboxSong();
+            sendServerMessageArea(l_name + " has forced a skip. Playing the next available song.");
+            return;
+        }
+        sendServerMessage("Unable to skip song. Jukebox is currently empty.");
+        return;
+    }
+    sendServerMessage("Unable to skip song. The jukebox is not running.");
 }