From 2c0d6e06bed8f11ace8b2b3569a55c7ced87610f Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Thu, 15 Feb 2024 13:56:47 +0300 Subject: [PATCH] engine: server: return NULL in SV_ClientBy{Id,Name} if client array isn't allocated --- engine/server/sv_client.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/server/sv_client.c b/engine/server/sv_client.c index 23ee0e24..500115b5 100644 --- a/engine/server/sv_client.c +++ b/engine/server/sv_client.c @@ -799,7 +799,7 @@ sv_client_t *SV_ClientById( int id ) ASSERT( id >= 0 ); - for( i = 0, cl = svs.clients; i < svgame.globals->maxClients; i++, cl++ ) + for( i = 0, cl = svs.clients; cl && i < svgame.globals->maxClients; i++, cl++ ) { if( !cl->state ) continue; @@ -819,7 +819,7 @@ sv_client_t *SV_ClientByName( const char *name ) if( !COM_CheckString( name )) return NULL; - for( i = 0, cl = svs.clients; i < svgame.globals->maxClients; i++, cl++ ) + for( i = 0, cl = svs.clients; cl && i < svgame.globals->maxClients; i++, cl++ ) { if( !cl->state ) continue;