From: Karel Zak <kzak@redhat.com>
Date: Wed, 30 Mar 2011 21:52:56 +0000 (+0200)
Subject: libmount: fix memory leak in cache
X-Git-Tag: v2.20-rc1~409
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2b6bd96f2b9998d573a5241c9e299ff4dd14bd2a;p=thirdparty%2Futil-linux.git

libmount: fix memory leak in cache

Reported-by: Petr Uzel <petr.uzel@suse.cz>
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/shlibs/mount/src/cache.c b/shlibs/mount/src/cache.c
index e0641c172c..18b6cd49af 100644
--- a/shlibs/mount/src/cache.c
+++ b/shlibs/mount/src/cache.c
@@ -457,8 +457,8 @@ char *mnt_resolve_path(const char *path, struct libmnt_cache *cache)
 		p = canonicalize_path(path);
 
 		if (p && cache) {
-			native = strdup(path);
-			real = strcmp(path, p) == 0 ? native : p;
+			real = p;
+			native = strcmp(path, p) == 0 ? real : strdup(path);
 
 			if (!native || !real)
 				goto error;