Skip to content
Snippets Groups Projects
Commit ba1d9784 authored by Konrad Rzeszutek Wilk's avatar Konrad Rzeszutek Wilk Committed by Colin Watson
Browse files

udf: Fix memory leak


Fixes: CID 73796

Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Reviewed-by: default avatarDaniel Kiper <daniel.kiper@oracle.com>
Reviewed-by: default avatarJan Setje-Eilers <jan.setjeeilers@oracle.com>

Patch-Name: udf-leak.patch
parent 2328abbe
No related branches found
No related tags found
No related merge requests found
......@@ -965,8 +965,10 @@ grub_udf_iterate_dir (grub_fshelp_node_t dir,
return 0;
if (grub_udf_read_icb (dir->data, &dirent.icb, child))
return 0;
{
grub_free (child);
return 0;
}
if (dirent.characteristics & GRUB_UDF_FID_CHAR_PARENT)
{
/* This is the parent directory. */
......@@ -988,11 +990,18 @@ grub_udf_iterate_dir (grub_fshelp_node_t dir,
dirent.file_ident_length,
(char *) raw))
!= dirent.file_ident_length)
return 0;
{
grub_free (child);
return 0;
}
filename = read_string (raw, dirent.file_ident_length, 0);
if (!filename)
grub_print_error ();
{
/* As the hook won't get called. */
grub_free (child);
grub_print_error ();
}
if (filename && hook (filename, type, child, hook_data))
{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment