adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enlarged some buffers to make space for multibyte characters.

Browse Source 
Also added overflow checks.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1848 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
meep-eep
2005-07-15 21:05:21 +00:00
parent 198971ea8a
commit cfa5f830fa
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/gameopt.c
+16 -12
View File
@@ -130,43 +130,47 @@ enum
static void
FeedbackSetting (BYTE which_setting)
{
UNICODE buf[20];
char tmpstr[3];
UNICODE buf[64];
const char *tmpstr;
buf[0] = '\0';
switch (which_setting)
{
case SOUND_ON_SETTING:
case SOUND_OFF_SETTING:
wsprintf (buf, "%s %s",
snprintf (buf, sizeof buf, "%s %s",
GAME_STRING (OPTION_STRING_BASE + 0),
GLOBAL (glob_flags) & SOUND_DISABLED
? GAME_STRING (OPTION_STRING_BASE + 3) : GAME_STRING (OPTION_STRING_BASE + 4));
? GAME_STRING (OPTION_STRING_BASE + 3) :
GAME_STRING (OPTION_STRING_BASE + 4));
break;
case MUSIC_ON_SETTING:
case MUSIC_OFF_SETTING:
wsprintf (buf, "%s %s",
snprintf (buf, sizeof buf, "%s %s",
GAME_STRING (OPTION_STRING_BASE + 1),
GLOBAL (glob_flags) & MUSIC_DISABLED
? GAME_STRING (OPTION_STRING_BASE + 3) : GAME_STRING (OPTION_STRING_BASE + 4));
? GAME_STRING (OPTION_STRING_BASE + 3) :
GAME_STRING (OPTION_STRING_BASE + 4));
break;
case CYBORG_OFF_SETTING:
case CYBORG_NORMAL_SETTING:
case CYBORG_DOUBLE_SETTING:
case CYBORG_SUPER_SETTING:
if (optWhichMenu == OPT_PC && which_setting > CYBORG_NORMAL_SETTING)
if (optWhichMenu == OPT_PC &&
which_setting > CYBORG_NORMAL_SETTING)
{
if (which_setting == CYBORG_DOUBLE_SETTING)
strcpy (tmpstr, "+");
tmpstr = "+";
else
strcpy (tmpstr, "++");
tmpstr = "++";
}
else
tmpstr[0] = 0;
wsprintf (buf, "%s %s%s",
tmpstr = "";
snprintf (buf, sizeof buf, "%s %s%s",
GAME_STRING (OPTION_STRING_BASE + 2),
!(GLOBAL (glob_flags) & CYBORG_ENABLED)
? GAME_STRING (OPTION_STRING_BASE + 3) : GAME_STRING (OPTION_STRING_BASE + 4),
? GAME_STRING (OPTION_STRING_BASE + 3) :
GAME_STRING (OPTION_STRING_BASE + 4),
tmpstr);
break;
case CHANGE_CAPTAIN_SETTING: