From 95548053ebb2837bfe331b4da26f49a4fed48c82 Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Mon, 20 Apr 2026 21:52:37 +1000 Subject: [PATCH] engine: common: set cmd_args to "" when tokenising, if we've no arguments Fixes metamod-fwgs[1] breaking when CMD_ARGS() returns NULL. [1]: https://github.com/FWGS/metamod-fwgs/blob/eedede40e806e7f3d1604de61ed43404928ea639/metamod/src/commands_meta.cpp#L63 --- engine/common/cmd.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/engine/common/cmd.c b/engine/common/cmd.c index a4a01c7d..7ca6931f 100644 --- a/engine/common/cmd.c +++ b/engine/common/cmd.c @@ -615,8 +615,11 @@ void Cmd_TokenizeString( const char *text ) if( !*text ) return; - if( cmd_argc == 1 ) - cmd_args = text; + switch( cmd_argc ) + { + case 0: cmd_args = ""; break; + case 1: cmd_args = text; break; + } text = COM_ParseFileSafe( (char*)text, cmd_token, sizeof( cmd_token ), PFILE_IGNOREBRACKET, NULL, NULL );