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

* grub-core/disk/efi/efidisk.c (grub_efidisk_get_device_name): Fix

Browse source 
incorrect memory usage.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-07-10 15:33:57 +02:00
parent 16a2bab03c
commit c4edd54832
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2011-07-10 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/disk/efi/efidisk.c (grub_efidisk_get_device_name): Fix
incorrect memory usage.
2011-07-10 Vladimir Serbinenko <phcoder@gmail.com> 2011-07-10 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-install.in: Source grub-mkconfig_lib. * util/grub-install.in: Source grub-mkconfig_lib.

9
grub-core/disk/efi/efidisk.c
View file

@ -709,7 +709,7 @@ grub_efidisk_get_device_name (grub_efi_handle_t *handle)
&& (GRUB_EFI_DEVICE_PATH_SUBTYPE (ldp) && (GRUB_EFI_DEVICE_PATH_SUBTYPE (ldp)
== GRUB_EFI_HARD_DRIVE_DEVICE_PATH_SUBTYPE)) == GRUB_EFI_HARD_DRIVE_DEVICE_PATH_SUBTYPE))
{ {
grub_partition_t tpart = NULL; char *partition_name = NULL;
char *device_name; char *device_name;
grub_efi_device_path_t *dup_dp, *dup_ldp; grub_efi_device_path_t *dup_dp, *dup_ldp;
grub_efi_hard_drive_device_path_t hd; grub_efi_hard_drive_device_path_t hd;
@ -722,7 +722,7 @@ grub_efidisk_get_device_name (grub_efi_handle_t *handle)
if (grub_partition_get_start (part) == hd.partition_start if (grub_partition_get_start (part) == hd.partition_start
&& grub_partition_get_len (part) == hd.partition_size) && grub_partition_get_len (part) == hd.partition_size)
{ {
tpart = part; partition_name = grub_partition_get_name (part);
return 1; return 1;
} }
@ -760,17 +760,14 @@ grub_efidisk_get_device_name (grub_efi_handle_t *handle)
} }
else else
{ {
char *partition_name;
grub_partition_iterate (parent, find_partition); grub_partition_iterate (parent, find_partition);
if (! tpart) if (! partition_name)
{ {
grub_disk_close (parent); grub_disk_close (parent);
return 0; return 0;
} }
partition_name = grub_partition_get_name (tpart);
device_name = grub_xasprintf ("%s,%s", parent->name, partition_name); device_name = grub_xasprintf ("%s,%s", parent->name, partition_name);
grub_free (partition_name); grub_free (partition_name);
} }