FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

canvas::KeyboardEvent: C0/C1 control characters are not printable.

Browse Source
This commit is contained in:
Thomas Geymayer
2014-08-25 21:49:44 +02:00
parent 4f94c22241
commit 088ce31f7c
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
simgear/canvas/events/KeyboardEvent.cxx
View File

@@ -305,10 +305,18 @@ namespace canvas
if( key_name.empty() )
return false;
// Check if _name contains exactly one (UTF-8 encoded) printable character.
std::string::const_iterator it = key_name.begin();
utf8::next(it, key_name.end());
return it == key_name.end();
uint32_t cp = utf8::next(it, key_name.end());
// Check if _name contains exactly one (UTF-8 encoded) character.
if( it != key_name.end() )
return false;
// C0 and C1 control characters are not printable.
if( cp <= 0x1f || (0x7f <= cp && cp <= 0x9f) )
return false;
return true;
}
} // namespace canvas