From: Lucas De Marchi <lucas.demarchi@intel.com>
Date: Thu, 14 Nov 2013 06:16:16 +0000 (-0200)
Subject: util: use _cleanup_free_ on path_make_absolute_cwd()
X-Git-Tag: v16~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b93d800640ca4ebe433400abcf743d9521b3f58a;p=thirdparty%2Fkmod.git

util: use _cleanup_free_ on path_make_absolute_cwd()
---

diff --git a/libkmod/libkmod-util.c b/libkmod/libkmod-util.c
index d6862506..837f417d 100644
--- a/libkmod/libkmod-util.c
+++ b/libkmod/libkmod-util.c
@@ -283,15 +283,15 @@ bool path_is_absolute(const char *p)
 
 char *path_make_absolute_cwd(const char *p)
 {
-	char *cwd, *r;
-	size_t plen;
-	size_t cwdlen;
+	_cleanup_free_ char *cwd = NULL;
+	size_t plen, cwdlen;
+	char *r;
 
 	if (path_is_absolute(p))
 		return strdup(p);
 
 	cwd = get_current_dir_name();
-	if (cwd == NULL)
+	if (!cwd)
 		return NULL;
 
 	plen = strlen(p);
@@ -299,11 +299,10 @@ char *path_make_absolute_cwd(const char *p)
 
 	/* cwd + '/' + p + '\0' */
 	r = realloc(cwd, cwdlen + 1 + plen + 1);
-	if (r == NULL) {
-		free(cwd);
+	if (r == NULL)
 		return NULL;
-	}
 
+	cwd = NULL;
 	r[cwdlen] = '/';
 	memcpy(&r[cwdlen + 1], p, plen + 1);