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

* disk/loopback.c (grub_cmd_loopback): Don't leak a grub_file_t

Browse source 
handle on failure.
(grub_loopback_close): Remove empty function.
(grub_loopback_dev): Remove close method.
This commit is contained in:
Colin Watson 2010-07-20 22:14:26 +01:00
parent dd8ff5c9e9
commit efc9d7f175
2 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2010-07-20 Colin Watson <cjwatson@ubuntu.com>
* disk/loopback.c (grub_cmd_loopback): Don't leak a grub_file_t
handle on failure.
(grub_loopback_close): Remove empty function.
(grub_loopback_dev): Remove close method.
2010-07-20 Colin Watson <cjwatson@ubuntu.com> 2010-07-20 Colin Watson <cjwatson@ubuntu.com>
Disable EFI cursor when the EFI console becomes inactive. Disable EFI cursor when the EFI console becomes inactive.

18
disk/loopback.c
View file

@ -76,6 +76,7 @@ grub_cmd_loopback (grub_extcmd_t cmd, int argc, char **args)
struct grub_arg_list *state = state = cmd->state; struct grub_arg_list *state = state = cmd->state;
grub_file_t file; grub_file_t file;
struct grub_loopback *newdev; struct grub_loopback *newdev;
grub_err_t ret;
if (argc < 1) if (argc < 1)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "device name required"); return grub_error (GRUB_ERR_BAD_ARGUMENT, "device name required");
@ -100,7 +101,7 @@ grub_cmd_loopback (grub_extcmd_t cmd, int argc, char **args)
{ {
char *newname = grub_strdup (args[1]); char *newname = grub_strdup (args[1]);
if (! newname) if (! newname)
return grub_errno; goto fail;
grub_file_close (newdev->file); grub_file_close (newdev->file);
newdev->file = file; newdev->file = file;
@ -114,13 +115,13 @@ grub_cmd_loopback (grub_extcmd_t cmd, int argc, char **args)
/* Unable to replace it, make a new entry. */ /* Unable to replace it, make a new entry. */
newdev = grub_malloc (sizeof (struct grub_loopback)); newdev = grub_malloc (sizeof (struct grub_loopback));
if (! newdev) if (! newdev)
return grub_errno; goto fail;
newdev->devname = grub_strdup (args[0]); newdev->devname = grub_strdup (args[0]);
if (! newdev->devname) if (! newdev->devname)
{ {
grub_free (newdev); grub_free (newdev);
return grub_errno; goto fail;
} }
newdev->file = file; newdev->file = file;
@ -133,6 +134,11 @@ grub_cmd_loopback (grub_extcmd_t cmd, int argc, char **args)
loopback_list = newdev; loopback_list = newdev;
return 0; return 0;
fail:
ret = grub_errno;
grub_file_close (file);
return ret;
} }
@ -171,11 +177,6 @@ grub_loopback_open (const char *name, grub_disk_t disk)
return 0; return 0;
} }
static void
grub_loopback_close (grub_disk_t disk __attribute__ ((unused)))
{
}
static grub_err_t static grub_err_t
grub_loopback_read (grub_disk_t disk, grub_disk_addr_t sector, grub_loopback_read (grub_disk_t disk, grub_disk_addr_t sector,
grub_size_t size, char *buf) grub_size_t size, char *buf)
@ -217,7 +218,6 @@ static struct grub_disk_dev grub_loopback_dev =
.id = GRUB_DISK_DEVICE_LOOPBACK_ID, .id = GRUB_DISK_DEVICE_LOOPBACK_ID,
.iterate = grub_loopback_iterate, .iterate = grub_loopback_iterate,
.open = grub_loopback_open, .open = grub_loopback_open,
.close = grub_loopback_close,
.read = grub_loopback_read, .read = grub_loopback_read,
.write = grub_loopback_write, .write = grub_loopback_write,
.next = 0 .next = 0