* font/font.c (grub_font_get_glyph_with_fallback): Avoid dereferencing
NULL font.
This commit is contained in:
parent
2bdb2892b3
commit
942a10c71e
2 changed files with 7 additions and 0 deletions
|
@ -1,3 +1,8 @@
|
|||
2010-07-02 Vladimir Serbinenko <phcoder@gmail.com>
|
||||
|
||||
* font/font.c (grub_font_get_glyph_with_fallback): Avoid dereferencing
|
||||
NULL font.
|
||||
|
||||
2010-07-02 Colin Watson <cjwatson@ubuntu.com>
|
||||
|
||||
* util/deviceiter.c (grub_util_iterate_devices): Skip device-mapper
|
||||
|
|
|
@ -1029,6 +1029,8 @@ grub_font_get_glyph_with_fallback (grub_font_t font, grub_uint32_t code)
|
|||
next = node->next;
|
||||
|
||||
glyph = grub_font_get_glyph_internal (curfont, code);
|
||||
if (glyph && !font)
|
||||
return glyph;
|
||||
if (glyph)
|
||||
{
|
||||
int d;
|
||||
|
|
Loading…
Reference in a new issue