From: Nathan Lynch <ntl@pobox.com>
Date: Wed, 19 May 2010 20:15:28 +0000 (+0200)
Subject: correct asprintf error checking
X-Git-Tag: lxc-0.7.0~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa9ab20562649707d44bfff90df44b7bc1a9f8b3;p=thirdparty%2Flxc.git

correct asprintf error checking

asprintf(3) returns -1 (not 0) on error.

Signed-off-by: Nathan Lynch <ntl@pobox.com>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
---

diff --git a/src/lxc/lxc_execute.c b/src/lxc/lxc_execute.c
index b9020b40c..669d38305 100644
--- a/src/lxc/lxc_execute.c
+++ b/src/lxc/lxc_execute.c
@@ -108,7 +108,10 @@ int main(int argc, char *argv[])
 	if (my_args.rcfile)
 		rcfile = (char *)my_args.rcfile;
 	else {
-		if (!asprintf(&rcfile, LXCPATH "/%s/config", my_args.name)) {
+		int rc;
+
+		rc = asprintf(&rcfile, LXCPATH "/%s/config", my_args.name);
+		if (rc == -1) {
 			SYSERROR("failed to allocate memory");
 			return -1;
 		}
diff --git a/src/lxc/lxc_restart.c b/src/lxc/lxc_restart.c
index e44bd1b54..f715a609d 100644
--- a/src/lxc/lxc_restart.c
+++ b/src/lxc/lxc_restart.c
@@ -126,7 +126,10 @@ int main(int argc, char *argv[])
 	if (my_args.rcfile)
 		rcfile = (char *)my_args.rcfile;
 	else {
-		if (!asprintf(&rcfile, LXCPATH "/%s/config", my_args.name)) {
+		int rc;
+
+		rc = asprintf(&rcfile, LXCPATH "/%s/config", my_args.name);
+		if (rc == -1) {
 			SYSERROR("failed to allocate memory");
 			return -1;
 		}
diff --git a/src/lxc/lxc_start.c b/src/lxc/lxc_start.c
index 5cc03db04..7aa17ff61 100644
--- a/src/lxc/lxc_start.c
+++ b/src/lxc/lxc_start.c
@@ -117,7 +117,10 @@ int main(int argc, char *argv[])
 	if (my_args.rcfile)
 		rcfile = (char *)my_args.rcfile;
 	else {
-		if (!asprintf(&rcfile, LXCPATH "/%s/config", my_args.name)) {
+		int rc;
+
+		rc = asprintf(&rcfile, LXCPATH "/%s/config", my_args.name);
+		if (rc == -1) {
 			SYSERROR("failed to allocate memory");
 			return err;
 		}