Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-30 10:26:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix crash: check that tile exists before removing

Browse source
This commit is contained in:
ehouse 2008-03-12 12:21:23 +00:00
parent 0f18efb925
commit 93a621c65c
1 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
common/model.c
View file

@ -1027,29 +1027,30 @@ model_moveBoardToTray( ModelCtxt* model, XP_S16 turn,
}
}
/* may be legal to fail to find, but we'd better return now! */
XP_ASSERT( index < player->nPending );
/* if we're called from putBackOtherPlayersTiles there may be nothing
here */
if ( index < player->nPending ) {
decrPendingTileCountAt( model, col, row );
notifyBoardListeners( model, turn, col, row, XP_FALSE );
decrPendingTileCountAt( model, col, row );
notifyBoardListeners( model, turn, col, row, XP_FALSE );
tile = pt->tile;
if ( (tile & TILE_BLANK_BIT) != 0 ) {
tile = dict_getBlankTile( model->vol.dict );
}
tile = pt->tile;
if ( (tile & TILE_BLANK_BIT) != 0 ) {
tile = dict_getBlankTile( model->vol.dict );
model_addPlayerTile( model, turn, trayOffset, tile );
--player->nPending;
for ( i = index; i < player->nPending; ++i ) {
player->pendingTiles[i] = player->pendingTiles[i+1];
}
if ( player->nPending == 0 ) {
invalLastMove( model );
}
invalidateScore( model, turn );
}
model_addPlayerTile( model, turn, trayOffset, tile );
--player->nPending;
for ( i = index; i < player->nPending; ++i ) {
player->pendingTiles[i] = player->pendingTiles[i+1];
}
if ( player->nPending == 0 ) {
invalLastMove( model );
}
invalidateScore( model, turn );
} /* model_moveBoardToTray */
void