Mamanyonyo/akashi-esquizolandia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix segfault due to insufficient jukebox state validation.

Browse Source
This commit is contained in:
Salanto 2022-06-15 22:54:38 +02:00 committed by Rosemary Witchaven
parent 5e6bc5c87b
commit 883ac90511
3 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/include/area_data.h
View File

@ -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.
*/

5
core/src/area_data.cpp
View File

@ -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;

15
core/src/commands/music.cpp
View File

@ -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.");
}