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.

2 files changed, 4 insertions, 6 deletions

diff --git a/cat/virt-cat.c b/cat/virt-cat.c
index 4d37ddab..775c7735 100644
--- a/cat/virt-cat.c
+++ b/cat/virt-cat.c
@@ -189,18 +189,17 @@ main (int argc, char *argv[])
     while (optind < argc - 1) {
       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);
diff --git a/cat/virt-ls.c b/cat/virt-ls.c
index b29af272..1ca016a8 100644
--- a/cat/virt-ls.c
+++ b/cat/virt-ls.c
@@ -297,18 +297,17 @@ main (int argc, char *argv[])
     while (optind < argc - 1) {
       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);