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

ofdisk: Fix devpath freeing logic.

Browse source
This commit is contained in:
Eric Snowberg 2015-10-26 23:03:06 +01:00 • committed by Vladimir Serbinenko
parent bf3df4070f
commit 0b72543afd
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
grub-core/disk/ieee1275/ofdisk.c
View file

@ -422,16 +422,20 @@ grub_ofdisk_open (const char *name, grub_disk_t disk)
op = ofdisk_hash_find (devpath); op = ofdisk_hash_find (devpath);
if (!op) if (!op)
op = ofdisk_hash_add (devpath, NULL); op = ofdisk_hash_add (devpath, NULL);
else
grub_free (devpath);
if (!op) if (!op)
return grub_errno; {
grub_free (devpath);
return grub_errno;
}
disk->id = (unsigned long) op; disk->id = (unsigned long) op;
disk->data = op->open_path; disk->data = op->open_path;
err = grub_ofdisk_get_block_size (devpath, &block_size, op); err = grub_ofdisk_get_block_size (devpath, &block_size, op);
if (err) if (err)
return err; {
grub_free (devpath);
return err;
}
if (block_size != 0) if (block_size != 0)
{ {
for (disk->log_sector_size = 0; for (disk->log_sector_size = 0;
@ -442,6 +446,7 @@ grub_ofdisk_open (const char *name, grub_disk_t disk)
disk->log_sector_size = 9; disk->log_sector_size = 9;
} }
grub_free (devpath);
return 0; return 0;
} }