From: Libo Chen <libo.chen@huawei.com>
Date: Tue, 10 Sep 2013 06:29:17 +0000 (+0200)
Subject: cgconfig: add check and nonzero
X-Git-Tag: v0.41~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e84f0c109e620c5d08a188f9ecc271955efc4590;p=thirdparty%2Flibcgroup.git

cgconfig: add check and nonzero

1. check return value of cgroup_string_list_init.
2. add nonzero for -a and -t

v4:
 - add nonzero for cgroup_new_cgroup

Signed-off-by: Libo Chen <clbchenlibo.chen@huawei.com>
Acked-by: Ivana Hutarova Varekova <varekova@redhat.com>
---

diff --git a/src/tools/cgconfig.c b/src/tools/cgconfig.c
index afbad647..8dd1e730 100644
--- a/src/tools/cgconfig.c
+++ b/src/tools/cgconfig.c
@@ -89,7 +89,9 @@ int main(int argc, char *argv[])
 	if (argc < 2)
 		usage(argv[0]); /* usage() exits */
 
-	ret = cgroup_string_list_init(&cfg_files, argc/2);
+	error = cgroup_string_list_init(&cfg_files, argc/2);
+	if (error)
+		goto err;
 
 	while ((c = getopt_long(argc, argv, "hl:L:t:a:d:f:s:", options,
 			NULL)) > 0) {
@@ -111,12 +113,14 @@ int main(int argc, char *argv[])
 			break;
 		case 'a':
 			/* set admin uid/gid */
-			if (parse_uid_gid(optarg, &auid, &agid, argv[0]))
+			error = parse_uid_gid(optarg, &auid, &agid, argv[0]);
+			if (error)
 				goto err;
 			break;
 		case 't':
 			/* set task uid/gid */
-			if (parse_uid_gid(optarg, &tuid, &tgid, argv[0]))
+			error = parse_uid_gid(optarg, &tuid, &tgid, argv[0]);
+			if (error)
 				goto err;
 			break;
 		case 'd':
@@ -152,6 +156,7 @@ int main(int argc, char *argv[])
 	/* set default permissions */
 	default_group = cgroup_new_cgroup("default");
 	if (!default_group) {
+		error = -1;
 		fprintf(stderr, "%s: cannot create default cgroup\n", argv[0]);
 		goto err;
 	}