quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

be safe while doing copy to EntityClass::flagnames

Browse Source
This commit is contained in:
Garux
2023-09-18 21:30:15 +06:00
parent 1a12e3b226
commit 1c3300d4bb
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
radiant/eclass_fgd.cpp
View File

@@ -353,7 +353,7 @@ void EntityClassFGD_parseClass( Tokeniser& tokeniser, bool fixedsize, bool isBas
ASSERT_MESSAGE( EntityClassFGD_parseToken( tokeniser, ":" ), PARSE_ERROR );
const char* name = tokeniser.getToken();
strcpy( entityClass->flagnames[bit], name );
strncpy( entityClass->flagnames[bit], name, std::size( entityClass->flagnames[bit] ) - 1 );
EntityClassAttribute *attribute = &EntityClass_insertAttribute( *entityClass, name, EntityClassAttribute( "flag", name ) ).second;
entityClass->flagAttributes[bit] = attribute;
{
@@ -656,7 +656,7 @@ void EntityClassFGD_resolveInheritance( EntityClass* derivedClass ){
for( size_t flag = 0; flag < MAX_FLAGS; ++flag ){
if( !string_empty( parentClass->flagnames[flag] ) && string_empty( derivedClass->flagnames[flag] ) ){
strcpy( derivedClass->flagnames[flag], parentClass->flagnames[flag] );
strncpy( derivedClass->flagnames[flag], parentClass->flagnames[flag], std::size( derivedClass->flagnames[flag] ) - 1 );
derivedClass->flagAttributes[flag] = parentClass->flagAttributes[flag];
}
}