From dd0707be5f9153a78ea0a07ec72f4e1f341a38c9 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 17 Jan 2012 18:28:44 +0000
Subject: fish options parsing: Allow add_drives to be called multiple times.

Ensure that the drv structure is always zeroed on allocation.

Don't leak old drv->device when add_drives is called multiple times.
---
 fish/fish.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'fish/fish.c')

diff --git a/fish/fish.c b/fish/fish.c
index b782b7cb..3cf15b20 100644
--- a/fish/fish.c
+++ b/fish/fish.c
@@ -341,13 +341,12 @@ main (int argc, char *argv[])
         list_prepared_drives ();
         exit (EXIT_SUCCESS);
       }
-      drv = malloc (sizeof (struct drv));
+      drv = calloc (1, sizeof (struct drv));
       if (!drv) {
         perror ("malloc");
         exit (EXIT_FAILURE);
       }
       drv->type = drv_N;
-      drv->device = NULL;
       drv->nr_drives = -1;
       if (asprintf (&drv->N.filename, "test%d.img",
                     next_prepared_drive++) == -1) {
@@ -415,18 +414,17 @@ main (int argc, char *argv[])
     while (optind < argc) {
       if (strchr (argv[optind], '/') ||
           access (argv[optind], F_OK) == 0) { /* simulate -a option */
-        drv = malloc (sizeof (struct drv));
+        drv = calloc (1, sizeof (struct drv));
         if (!drv) {
           perror ("malloc");
           exit (EXIT_FAILURE);
         }
         drv->type = drv_a;
         drv->a.filename = argv[optind];
-        drv->a.format = NULL;
         drv->next = drvs;
         drvs = drv;
       } else {                  /* simulate -d option */
-        drv = malloc (sizeof (struct drv));
+        drv = calloc (1, sizeof (struct drv));
         if (!drv) {
           perror ("malloc");
           exit (EXIT_FAILURE);
-- 
cgit