Fix CBaseEntity::ScriptGetKeyValue() returning cached string on invalid input

samisalreadytaken · samisalreadytaken · commit 82d38183ad06 · 2023-12-05T14:45:07.000+03:00
diff --git a/sp/src/game/server/baseentity.cpp b/sp/src/game/server/baseentity.cpp
@@ -10297,8 +10297,9 @@ bool CBaseEntity::ScriptAddOutput( const char *pszOutputName, const char *pszTar
 const char *CBaseEntity::ScriptGetKeyValue( const char *pszKeyName )
 {
 	static char szValue[128];
-	GetKeyValue( pszKeyName, szValue, sizeof(szValue) );
-	return szValue;
+	if ( GetKeyValue( pszKeyName, szValue, sizeof(szValue) ) )
+		return szValue;
+	return NULL;
 }
 
 //-----------------------------------------------------------------------------

Original file line number	Diff line number	Diff line change
`@@ -10297,8 +10297,9 @@ bool CBaseEntity::ScriptAddOutput( const char pszOutputName, const char pszTar`
`10297`	`10297`	`const char CBaseEntity::ScriptGetKeyValue( const char pszKeyName )`
`10298`	`10298`	`{`
`10299`	`10299`	`static char szValue[128];`
`10300`		`- GetKeyValue( pszKeyName, szValue, sizeof(szValue) );`
`10301`		`- return szValue;`
	`10300`	`+ if ( GetKeyValue( pszKeyName, szValue, sizeof(szValue) ) )`
	`10301`	`+ return szValue;`
	`10302`	`+ return NULL;`
`10302`	`10303`	`}`
`10303`	`10304`
`10304`	`10305`	`//-----------------------------------------------------------------------------`