jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

additional null checks in player, gameselector, remoteclient, log (#2514)

Browse source
This commit is contained in:
Zach H 2017-03-19 12:55:55 -04:00 • committed by GitHub
parent 212a7d00db
commit 0da2bdd7aa
4 changed files with 26 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
cockatrice/src/player.cpp
View file

@ -481,8 +481,9 @@ void Player::clear()
void Player::addPlayer(Player *player)
{
if (player == this)
if (player == nullptr || player == this)
return;
for (int i = 0; i < playerLists.size(); ++i) {
QAction *newAction = playerLists[i]->addAction(player->getName());
newAction->setData(player->getId());
@ -492,6 +493,9 @@ void Player::addPlayer(Player *player)
void Player::removePlayer(Player *player)
{
if (player == nullptr)
return;
for (int i = 0; i < playerLists.size(); ++i) {
QList<QAction *> actionList = playerLists[i]->actions();
for (int j = 0; j < actionList.size(); ++j)
@ -1137,7 +1141,8 @@ void Player::actCreateAllRelatedCards()
void Player::createCard(const CardItem *sourceCard, const QString &dbCardName) {
CardInfo *cardInfo = db->getCard(dbCardName);
if(!cardInfo)
if (cardInfo == nullptr || sourceCard == nullptr)
return;
// get the target token's location
@ -1172,6 +1177,9 @@ void Player::actSayMessage()
void Player::setCardAttrHelper(const GameEventContext &context, CardItem *card, CardAttribute attribute, const QString &avalue, bool allCards)
{
if (card == nullptr)
return;
bool moveCardContext = context.HasExtension(Context_MoveCard::ext);
switch (attribute) {
case AttrTapped: {
@ -1728,6 +1736,9 @@ void Player::processCardAttachment(const ServerInfo_Player &info)
void Player::playCard(CardItem *c, bool faceDown, bool tapped)
{
if (c == nullptr)
return;
Command_MoveCard cmd;
cmd.set_start_player_id(c->getZone()->getPlayer()->getId());
cmd.set_start_zone(c->getZone()->getName().toStdString());
@ -2347,6 +2358,9 @@ void Player::refreshShortcuts()
void Player::updateCardMenu(const CardItem *card)
{
if (card == nullptr)
return;
QMenu *cardMenu = card->getCardMenu();
QMenu *ptMenu = card->getPTMenu();
QMenu *moveMenu = card->getMoveMenu();
@ -2438,10 +2452,8 @@ void Player::updateCardMenu(const CardItem *card)
}
void Player::addRelatedCardActions(const CardItem *card, QMenu *cardMenu) {
if (!card || !cardMenu || !card->getInfo())
{
if (card == nullptr || cardMenu == nullptr || card->getInfo() == nullptr)
return;
}
QStringList relatedCards = *new QStringList();
relatedCards.append(card->getInfo()->getRelatedCards());