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

fix assertion failure in mixed-version rematch case

Browse source
This commit is contained in:
Eric House 2023-12-23 07:14:43 -08:00
parent ffc64bc5dd
commit b5de43e3dc
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
xwords4/common/server.c
View file

@ -4369,8 +4369,9 @@ setPlayerOrder( const ServerCtxt* server, RematchOrder ro,
LOG_RI( rip ); LOG_RI( rip );
} }
} }
XP_ASSERT(success);
return success; return success;
} } /* setPlayerOrder */
XP_Bool XP_Bool
server_getRematchInfo( const ServerCtxt* server, XW_UtilCtxt* newUtil, server_getRematchInfo( const ServerCtxt* server, XW_UtilCtxt* newUtil,
@ -4436,17 +4437,15 @@ server_getRematchInfo( const ServerCtxt* server, XW_UtilCtxt* newUtil,
CommsAddrRec addrs[MAX_NUM_PLAYERS]; CommsAddrRec addrs[MAX_NUM_PLAYERS];
int nAddrs = 0; int nAddrs = 0;
comms_getHostAddr( comms, &addrs[nAddrs++] ); comms_getHostAddr( comms, &addrs[nAddrs++] );
if ( !!server->nv.rematch.addrs ) {
XWStreamCtxt* stream = mkServerStream( server ); XWStreamCtxt* stream = mkServerStream( server, server->nv.streamVersion );
stream_setVersion( stream, server->nv.streamVersion ); stream_putBytes( stream, server->nv.rematch.addrs,
stream_putBytes( stream, server->nv.rematch.addrs, server->nv.rematch.addrsLen );
server->nv.rematch.addrsLen ); while ( 0 < stream_getSize( stream ) ) {
while ( 0 < stream_getSize( stream ) ) { XP_ASSERT( nAddrs < VSIZE(addrs) );
XP_ASSERT( nAddrs < VSIZE(addrs) ); addrFromStream( &addrs[nAddrs++], stream );
addrFromStream( &addrs[nAddrs++], stream );
}
stream_destroy( stream );
} }
stream_destroy( stream );
int nextRemote = 0; int nextRemote = 0;
for ( int ii = 0; success && ii < newGI->nPlayers; ++ii ) { for ( int ii = 0; success && ii < newGI->nPlayers; ++ii ) {
@ -4460,7 +4459,7 @@ server_getRematchInfo( const ServerCtxt* server, XW_UtilCtxt* newUtil,
} }
} }
if ( success ) { if ( success ) {
success = nextRemote == nAddrs-1; success = nextRemote == nAddrs;
} }
} }
} else { } else {