From: Karel Zak <kzak@redhat.com>
Date: Wed, 27 Mar 2013 15:25:30 +0000 (+0100)
Subject: wipefs: fix memory leak [coverity scan]
X-Git-Tag: v2.23-rc2~89
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e6fc1139b42b0051665ea1809baf491087369b1;p=thirdparty%2Futil-linux.git

wipefs: fix memory leak [coverity scan]

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/misc-utils/wipefs.c b/misc-utils/wipefs.c
index 56024301e4..156f2143da 100644
--- a/misc-utils/wipefs.c
+++ b/misc-utils/wipefs.c
@@ -216,7 +216,7 @@ get_desc_for_probe(struct wipe_desc *wp, blkid_probe pr)
 static blkid_probe
 new_probe(const char *devname, int mode)
 {
-	blkid_probe pr;
+	blkid_probe pr = NULL;
 
 	if (!devname)
 		return NULL;
@@ -227,8 +227,10 @@ new_probe(const char *devname, int mode)
 			goto error;
 
 		pr = blkid_new_probe();
-		if (pr && blkid_probe_set_device(pr, fd, 0, 0))
+		if (pr && blkid_probe_set_device(pr, fd, 0, 0)) {
+			close(fd);
 			goto error;
+		}
 	} else
 		pr = blkid_new_probe_from_filename(devname);
 
@@ -245,6 +247,7 @@ new_probe(const char *devname, int mode)
 
 	return pr;
 error:
+	blkid_free_probe(pr);
 	err(EXIT_FAILURE, _("error: %s: probing initialization failed"), devname);
 	return NULL;
 }