[src/trunk]: src/sbin/gpt CID 1341560: Free arg.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3e8a73f921ce
branches:  trunk
changeset: 342045:3e8a73f921ce
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Dec 03 21:43:25 2015 +0000

description:
CID 1341560: Free arg.

diffstat:

 sbin/gpt/add.c |  20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diffs (56 lines):

diff -r 3156e21d5bc8 -r 3e8a73f921ce sbin/gpt/add.c
--- a/sbin/gpt/add.c    Thu Dec 03 21:40:32 2015 +0000
+++ b/sbin/gpt/add.c    Thu Dec 03 21:43:25 2015 +0000
@@ -33,7 +33,7 @@
 __FBSDID("$FreeBSD: src/sbin/gpt/add.c,v 1.14 2006/06/22 22:05:28 marcel Exp $");
 #endif
 #ifdef __RCSID
-__RCSID("$NetBSD: add.c,v 1.40 2015/12/03 20:58:08 christos Exp $");
+__RCSID("$NetBSD: add.c,v 1.41 2015/12/03 21:43:25 christos Exp $");
 #endif
 
 #include <sys/types.h>
@@ -168,20 +168,20 @@
                switch(ch) {
                case 'b':
                        if (gpt_human_get(&block) == -1)
-                               return usage();
+                               goto usage;
                        break;
                case 'l':
                        if (gpt_name_get(gpt, &name) == -1)
-                               return usage();
+                               goto usage;
                        break;
                case 't':
                        if (gpt_uuid_get(gpt, &type) == -1)
-                               return usage();
+                               goto usage;
                        break;
                default:
                        if (gpt_add_ais(gpt, &alignment, &entry, &size, ch)
                            == -1)
-                               return usage();
+                               goto usage;
                        break;
                }
        }
@@ -194,10 +194,16 @@
                gpt_uuid_create(GPT_TYPE_NETBSD_FFS, type, NULL, 0);
 
        if (optind != argc)
-               return usage();
+               goto cleanup;
 
        if ((sectors = gpt_check_ais(gpt, alignment, ~0U, size)) == -1)
-               return -1;
+               goto cleanup;
 
        return add(gpt, alignment, block, sectors, size, entry, name, type);
+cleanup:
+       free(name);
+       return -1;
+usage:
+       free(name);
+       return usage();
 }