teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

[Browser] Fixed two crashes relating to invalid data

Browse source
This commit is contained in:
Battlerax 2017-02-24 14:52:22 -06:00 committed by Stanislav Zhukov
parent 76e866c5c9
commit c9dc75f589
2 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
apps/browser/NetController.cpp
View file

@ -85,13 +85,12 @@ void NetController::setData(QString address, QJsonObject server, ServerModel *mo
model->setData(mi, server["passw"].toBool()); model->setData(mi, server["passw"].toBool());
mi = model->index(0, ServerData::PING); mi = model->index(0, ServerData::PING);
// This *should* fix a crash when a port isn't returned by data.
if(!address.contains(":")) // This *should* fix a crash when a port isn't returned by data.
{ if(!address.contains(":"))
address.append(":25565"); address.append(":25565");
} QStringList addr = address.split(":");
QStringList addr = address.split(":"); model->setData(mi, PingRakNetServer(addr[0].toLatin1().data(), addr[1].toUShort()));
model->setData(mi, PingRakNetServer(addr[0].toLatin1().data(), addr[1].toUShort()));
} }
bool NetController::downloadInfo(QAbstractItemModel *pModel, QModelIndex index) bool NetController::downloadInfo(QAbstractItemModel *pModel, QModelIndex index)
@ -229,6 +228,8 @@ void NetController::updateInfo()
sd->players = map["players"].toInt(); sd->players = map["players"].toInt();
sd->maxPlayers = map["max_players"].toInt(); sd->maxPlayers = map["max_players"].toInt();
if(!sd->addr.contains(":"))
sd->addr.append(":25565");
QStringList addr = sd->addr.split(":"); QStringList addr = sd->addr.split(":");
sd->ping = PingRakNetServer(addr[0].toLatin1(), addr[1].toUShort()); sd->ping = PingRakNetServer(addr[0].toLatin1(), addr[1].toUShort());
if(sd->ping != PING_UNREACHABLE) if(sd->ping != PING_UNREACHABLE)

21
apps/browser/ServerInfoDialog.cpp
View file

@ -22,15 +22,18 @@ void ServerInfoDialog::refresh()
{ {
NetController::get()->updateInfo(); NetController::get()->updateInfo();
ServerData *sd = NetController::get()->selectedServer(); ServerData *sd = NetController::get()->selectedServer();
leAddr->setText(sd->addr); if (sd)
lblName->setText(sd->hostName); {
lblPing->setNum(sd->ping); leAddr->setText(sd->addr);
lblName->setText(sd->hostName);
lblPing->setNum(sd->ping);
listPlayers->clear(); listPlayers->clear();
QStringList players = NetController::get()->players(); QStringList players = NetController::get()->players();
listPlayers->addItems(players); listPlayers->addItems(players);
listPlugins->clear(); listPlugins->clear();
listPlugins->addItems(NetController::get()->plugins()); listPlugins->addItems(NetController::get()->plugins());
lblPlayers->setText(QString::number(players.size()) + " / " + QString::number(sd->maxPlayers)); lblPlayers->setText(QString::number(players.size()) + " / " + QString::number(sd->maxPlayers));
}
} }