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.

1 files changed, 2 insertions, 3 deletions

diff --git a/rescue/virt-rescue.c b/rescue/virt-rescue.c
index 9a354b82..efde9837 100644
--- a/rescue/virt-rescue.c
+++ b/rescue/virt-rescue.c
@@ -240,18 +240,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);