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

merge mainline into net

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-07-02 18:52:50 +02:00
commit 03a0046581
45 changed files with 682 additions and 233 deletions
Download patch file Download diff file Expand all files Collapse all files

6
grub-core/normal/cmdline.c
View file

@ -500,8 +500,7 @@ grub_cmdline_get (const char *prompt)
case GRUB_TERM_CTRL | 'k':
if (lpos < llen)
{
if (kill_buf)
grub_free (kill_buf);
grub_free (kill_buf);
kill_buf = grub_malloc ((llen - lpos + 1)
* sizeof (grub_uint32_t));
@ -566,8 +565,7 @@ grub_cmdline_get (const char *prompt)
{
grub_size_t n = lpos;
if (kill_buf)
grub_free (kill_buf);
grub_free (kill_buf);
kill_buf = grub_malloc (n + 1);
if (grub_errno)