vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* font/font.c (grub_font_get_glyph_with_fallback): Avoid dereferencing

Browse source 
NULL font.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-07-02 18:25:42 +02:00
parent 2bdb2892b3
commit 942a10c71e
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> 2010-07-02 Colin Watson <cjwatson@ubuntu.com>
* util/deviceiter.c (grub_util_iterate_devices): Skip device-mapper * util/deviceiter.c (grub_util_iterate_devices): Skip device-mapper

2
font/font.c
View file

@ -1029,6 +1029,8 @@ grub_font_get_glyph_with_fallback (grub_font_t font, grub_uint32_t code)
next = node->next; next = node->next;
glyph = grub_font_get_glyph_internal (curfont, code); glyph = grub_font_get_glyph_internal (curfont, code);
if (glyph && !font)
return glyph;
if (glyph) if (glyph)
{ {
int d; int d;