From b5de43e3dc80ed95cbd694f8b288c498275df52d Mon Sep 17 00:00:00 2001
From: Eric House <eehouse@eehouse.org>
Date: Sat, 23 Dec 2023 07:14:43 -0800
Subject: [PATCH] fix assertion failure in mixed-version rematch case

---
 xwords4/common/server.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/xwords4/common/server.c b/xwords4/common/server.c
index 527b526d4..74489b4b6 100644
--- a/xwords4/common/server.c
+++ b/xwords4/common/server.c
@@ -4369,8 +4369,9 @@ setPlayerOrder( const ServerCtxt* server, RematchOrder ro,
             LOG_RI( rip );
         }
     }
+    XP_ASSERT(success);
     return success;
-}
+} /* setPlayerOrder */
 
 XP_Bool
 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];
                 int nAddrs = 0;
                 comms_getHostAddr( comms, &addrs[nAddrs++] );
-                if ( !!server->nv.rematch.addrs ) {
-                    XWStreamCtxt* stream = mkServerStream( server );
-                    stream_setVersion( stream, server->nv.streamVersion );
-                    stream_putBytes( stream, server->nv.rematch.addrs,
-                                     server->nv.rematch.addrsLen );
-                    while ( 0 < stream_getSize( stream ) ) {
-                        XP_ASSERT( nAddrs < VSIZE(addrs) );
-                        addrFromStream( &addrs[nAddrs++], stream );
-                    }
-                    stream_destroy( stream );
+
+                XWStreamCtxt* stream = mkServerStream( server, server->nv.streamVersion );
+                stream_putBytes( stream, server->nv.rematch.addrs,
+                                 server->nv.rematch.addrsLen );
+                while ( 0 < stream_getSize( stream ) ) {
+                    XP_ASSERT( nAddrs < VSIZE(addrs) );
+                    addrFromStream( &addrs[nAddrs++], stream );
                 }
+                stream_destroy( stream );
 
                 int nextRemote = 0;
                 for ( int ii = 0; success && ii < newGI->nPlayers; ++ii ) {
@@ -4460,7 +4459,7 @@ server_getRematchInfo( const ServerCtxt* server, XW_UtilCtxt* newUtil,
                     }
                 }
                 if ( success ) {
-                    success = nextRemote == nAddrs-1;
+                    success = nextRemote == nAddrs;
                 }
             }
         } else {