system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 17:34:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

wrc: Only allow control key characters ^A to ^Z.

Browse source 
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2016-02-20 13:29:45 +09:00
parent 22cb2beb1c
commit e8076eeced
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tools/wrc/genres.c
View file

@ -297,8 +297,11 @@ static int parse_accel_string( const string_t *key, int flags )
}
else if(key->str.cstr[0] == '^')
{
keycode = toupper((unsigned char)key->str.cstr[1]) - '@';
if(keycode >= ' ')
if (key->str.cstr[1] >= 'a' && key->str.cstr[1] <= 'z')
keycode = key->str.cstr[1] - 'a' + 1;
else if (key->str.cstr[1] >= 'A' && key->str.cstr[1] <= 'Z')
keycode = key->str.cstr[1] - 'A' + 1;
else
{
print_location( &key->loc );
error("Control-code out of range\n");
@ -324,8 +327,11 @@ static int parse_accel_string( const string_t *key, int flags )
}
else if(key->str.wstr[0] == '^')
{
keycode = toupperW(key->str.wstr[1]) - '@';
if(keycode >= ' ')
if (key->str.wstr[1] >= 'a' && key->str.wstr[1] <= 'z')
keycode = key->str.wstr[1] - 'a' + 1;
else if (key->str.wstr[1] >= 'A' && key->str.wstr[1] <= 'Z')
keycode = key->str.wstr[1] - 'A' + 1;
else
{
print_location( &key->loc );
error("Control-code out of range\n");