Skip to content

[TF2] Fix to prevent "es_419" from being truncated due to buffer size #1645

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −7
Open

[TF2] Fix to prevent "es_419" from being truncated due to buffer size #1645

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions src/common/language.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,11 @@ ELanguage PchLanguageICUCodeToELanguage( const char *pchICUCode, ELanguage eDefa
if ( !pchICUCode )
return eDefault;

// Match to no more than the param length so either a short 'en' or
// full 'zh-Hant' can match
int nLen = Q_strlen( pchICUCode );

// we only have 5 character ICU codes so this should be enough room
char rchCleanedCode[ 6 ];
// we only have 5 character ICU codes but 'es_419' has 6 characters, so we increase the buffer to 8
char rchCleanedCode[ 8 ];
Q_strncpy( rchCleanedCode, pchICUCode, Q_ARRAYSIZE( rchCleanedCode ) );
if( nLen >= 3 && rchCleanedCode[ 2 ] == '-' )
int nLen = ( int ) Q_strlen( rchCleanedCode );
if ( nLen >= 3 && rchCleanedCode[ 2 ] == '-' )
{
rchCleanedCode[ 2 ] = '_';
}
Expand Down