X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fish%2Finspect.c;h=0b82ade52747e74a93bc1bc50356a77da8ff9c1f;hb=7194dae8bc96077a7cfe5b39288448af3c58b3e5;hp=5e1948cd143bffeb0bea8c20c6403a6a635dd463;hpb=a20e5c00c35490fa29668630113a01240a69b701;p=libguestfs.git

diff --git a/fish/inspect.c b/fish/inspect.c
index 5e1948c..0b82ade 100644
--- a/fish/inspect.c
+++ b/fish/inspect.c
@@ -43,14 +43,14 @@ free_strings (char **argv)
   free (argv);
 }
 
-static int
+static size_t
 count_strings (char *const *argv)
 {
-  int c;
+  size_t i;
 
-  for (c = 0; argv[c]; ++c)
+  for (i = 0; argv[i]; ++i)
     ;
-  return c;
+  return i;
 }
 
 static int
@@ -88,12 +88,14 @@ inspect_mount (void)
   if (roots[0] == NULL) {
     fprintf (stderr, _("%s: no operating system was found on this disk\n"),
              program_name);
+    free_strings (roots);
     exit (EXIT_FAILURE);
   }
 
   if (roots[1] != NULL) {
     fprintf (stderr, _("%s: multi-boot operating systems are not supported by the -i option\n"),
              program_name);
+    free_strings (roots);
     exit (EXIT_FAILURE);
   }
 
@@ -142,7 +144,7 @@ void
 print_inspect_prompt (void)
 {
   char *name = guestfs_inspect_get_product_name (g, root);
-  if (STRNEQ (name, "unknown"))
+  if (name && STRNEQ (name, "unknown"))
     printf (_("Operating system: %s\n"), name);
   free (name);