From: Karel Zak <kzak@redhat.com>
Date: Thu, 2 Feb 2012 11:28:54 +0000 (+0100)
Subject: sfdisk: fix fd leak
X-Git-Tag: v2.21-rc2~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=06c243d3580a6549c70b7c863d222cd442c4999e;p=thirdparty%2Futil-linux.git

sfdisk: fix fd leak

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

diff --git a/fdisk/sfdisk.c b/fdisk/sfdisk.c
index 3f5f74f375..a1eafb77ea 100644
--- a/fdisk/sfdisk.c
+++ b/fdisk/sfdisk.c
@@ -2922,14 +2922,14 @@ do_size(char *dev, int silent) {
 	    perror(dev);
 	    errx(EXIT_FAILURE, _("Cannot get size of %s"), dev);
 	}
-	return;
+	goto done;
     }
 
     size /= 2;			/* convert sectors to blocks */
 
     /* a CDROM drive without mounted CD yields MAXINT */
     if (silent && size == ((1 << 30) - 1))
-	return;
+	goto done;
 
     if (silent)
 	printf("%s: %9llu\n", dev, size);
@@ -2938,6 +2938,7 @@ do_size(char *dev, int silent) {
 
     total_size += size;
 
+done:
     close(fd);
 }