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

Fix few memory errors

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-03-16 23:03:08 +01:00
parent 7c464a1ec5
commit eaa1f9a64b
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gfxmenu/font.c
View file

@ -63,10 +63,10 @@ grub_font_draw_string (const char *str, grub_font_t font,
if (!glyph)
return grub_errno;
err = grub_font_draw_glyph (glyph, color, x, baseline_y);
x += glyph->device_width;
grub_free (glyph);
if (err)
return err;
x += glyph->device_width;
}
grub_free (visual);

13
include/grub/unicode.h
View file

@ -130,13 +130,16 @@ grub_unicode_glyph_dup (const struct grub_unicode_glyph *in)
if (!out)
return NULL;
grub_memcpy (out, in, sizeof (*in));
out->combining = grub_malloc (in->ncomb * sizeof (*in));
if (!out->combining)
if (in->combining)
{
grub_free (out);
return NULL;
out->combining = grub_malloc (in->ncomb * sizeof (*in));
if (!out->combining)
{
grub_free (out);
return NULL;
}
grub_memcpy (out->combining, in->combining, in->ncomb * sizeof (*in));
}
grub_memcpy (out->combining, in->combining, in->ncomb * sizeof (*in));
return out;
}

6
normal/charset.c
View file

@ -282,7 +282,8 @@ grub_utf8_to_ucs4_alloc (const char *msg, grub_uint32_t **unicode_msg,
msg_len = grub_utf8_to_ucs4 (*unicode_msg, msg_len,
(grub_uint8_t *) msg, -1, 0);
*last_position = *unicode_msg + msg_len;
if (last_position)
*last_position = *unicode_msg + msg_len;
return msg_len;
}
@ -529,13 +530,14 @@ grub_unicode_aglomerate_comb (const grub_uint32_t *in, grub_size_t inlen,
|| comb_type == GRUB_UNICODE_COMB_ME
|| comb_type == GRUB_UNICODE_COMB_MN)
last_comb_pointer = out->ncomb;
n = grub_realloc (out->combining,
n = grub_realloc (out->combining,
sizeof (n[0]) * (out->ncomb + 1));
if (!n)
{
grub_errno = GRUB_ERR_NONE;
continue;
}
out->combining = n;
for (j = last_comb_pointer; j < out->ncomb; j++)
if (out->combining[j].type > comb_type)