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

* grub-core/term/serial.c (grub_serial_register): Fix invalid free.

Browse source 
Ensure that pointers are inited to NULL and that pointers are not
	accessed after free.
This commit is contained in:
Vladimir Serbinenko 2014-01-26 02:36:05 +01:00
parent 5ae584c0b0
commit 9afe2053c9
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2014-01-26 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/term/serial.c (grub_serial_register): Fix invalid free.
Ensure that pointers are inited to NULL and that pointers are not
accessed after free.
2014-01-25 Andrey Borzenkov <arvidjaar@gmail.com> 2014-01-25 Andrey Borzenkov <arvidjaar@gmail.com>

8
grub-core/term/serial.c
View file

@ -338,23 +338,23 @@ grub_serial_register (struct grub_serial_port *port)
grub_free (indata); grub_free (indata);
return grub_errno; return grub_errno;
} }
out = grub_malloc (sizeof (*out)); out = grub_zalloc (sizeof (*out));
if (!out) if (!out)
{ {
grub_free (in);
grub_free (indata); grub_free (indata);
grub_free ((char *) in->name); grub_free ((char *) in->name);
grub_free (in);
return grub_errno; return grub_errno;
} }
outdata = grub_malloc (sizeof (*outdata)); outdata = grub_malloc (sizeof (*outdata));
if (!outdata) if (!outdata)
{ {
grub_free (in);
grub_free (indata); grub_free (indata);
grub_free ((char *) in->name); grub_free ((char *) in->name);
grub_free (out); grub_free (out);
grub_free (in);
return grub_errno; return grub_errno;
} }