Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-15 08:47:56 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix crash tile-picking when too few tiles left

Browse source
This commit is contained in:
Eric House 2024-05-17 08:41:51 -07:00
parent 3a2fe216de
commit 3d51de4bf7
1 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
xwords4/common/server.c
View file

@ -2775,22 +2775,23 @@ fetchTiles( ServerCtxt* server, XWEnv xwe, XP_U16 playerNum, XP_U16 nToFetch,
/* Then fetch the rest without asking. But if we're in duplicate mode,
make sure the tray allows some moves (e.g. isn't all consonants when
the board's empty.) */
XP_ASSERT( nToFetch >= nSoFar );
XP_U16 nLeft = nToFetch - nSoFar;
for ( XP_U16 nBadTrays = 0; 0 < nLeft; ) {
pool_requestTiles( pool, &resultTiles->tiles[nSoFar], &nLeft );
if ( nToFetch >= nSoFar ) {
XP_U16 nLeft = nToFetch - nSoFar;
for ( XP_U16 nBadTrays = 0; 0 < nLeft; ) {
pool_requestTiles( pool, &resultTiles->tiles[nSoFar], &nLeft );
if ( !inDuplicateMode( server ) && !forceCanPlay ) {
break;
} else if ( trayAllowsMoves( server, xwe, playerNum, &resultTiles->tiles[0],
nSoFar + nLeft )
|| ++nBadTrays >= 5 ) {
break;
if ( !inDuplicateMode( server ) && !forceCanPlay ) {
break;
} else if ( trayAllowsMoves( server, xwe, playerNum, &resultTiles->tiles[0],
nSoFar + nLeft )
|| ++nBadTrays >= 5 ) {
break;
}
pool_replaceTiles2( pool, nLeft, &resultTiles->tiles[nSoFar] );
}
pool_replaceTiles2( pool, nLeft, &resultTiles->tiles[nSoFar] );
}
nSoFar += nLeft;
nSoFar += nLeft;
}
XP_ASSERT( nSoFar < 0x00FF );
resultTiles->nTiles = (XP_U8)nSoFar;