edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix exception in GetAnnouncementLine with empty list

Browse source
This commit is contained in:
Robert Müller 2021-10-17 22:50:59 +02:00
parent 8ffc7967f8
commit fbda0468c6
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/engine/server/server.cpp
View file

@ -3667,7 +3667,12 @@ const char *CServer::GetAnnouncementLine(char const *pFileName)
if(str_length(pLine)) if(str_length(pLine))
if(pLine[0] != '#') if(pLine[0] != '#')
Lines.push_back(pLine); Lines.push_back(pLine);
if(Lines.size() == 1)
if(Lines.empty())
{
return 0;
}
else if(Lines.size() == 1)
{ {
m_AnnouncementLastLine = 0; m_AnnouncementLastLine = 0;
} }
@ -3680,8 +3685,9 @@ const char *CServer::GetAnnouncementLine(char const *pFileName)
{ {
unsigned Rand; unsigned Rand;
do do
{
Rand = rand() % Lines.size(); Rand = rand() % Lines.size();
while(Rand == m_AnnouncementLastLine); } while(Rand == m_AnnouncementLastLine);
m_AnnouncementLastLine = Rand; m_AnnouncementLastLine = Rand;
} }