* grub-core/kern/misc.c (grub_vsnprintf_real): Don't attempt to

transform invalid unicode codepoints.
This commit is contained in:
Vladimir Serbinenko 2013-10-27 13:34:46 +01:00
parent 891b713be3
commit a60dae7e4e
2 changed files with 6 additions and 11 deletions

View file

@ -1,3 +1,8 @@
2013-10-21 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/kern/misc.c (grub_vsnprintf_real): Don't attempt to
transform invalid unicode codepoints.
2013-10-21 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/kern/misc.c (grub_vsnprintf_real): Remove needless explicit

View file

@ -947,21 +947,11 @@ grub_vsnprintf_real (char *str, grub_size_t max_len, const char *fmt0, va_list a
shift = 12;
mask = 0xe0;
}
else if (code <= 0x1fffff)
else if (code <= 0x10ffff)
{
shift = 18;
mask = 0xf0;
}
else if (code <= 0x3ffffff)
{
shift = 24;
mask = 0xf8;
}
else if (code <= 0x7fffffff)
{
shift = 30;
mask = 0xfc;
}
else
{
code = '?';