summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2005-01-17 14:32:20 -0500
committerTheodore Ts'o <tytso@mit.edu>2005-01-17 14:32:20 -0500
commit9290404ea7b135a1a0cc8d6518395e9a768087bf (patch)
tree780548912625c018e816cc0a68c3b4a6c36db015
parentecd0d8fe2a5948d9676e3c4e3a7bd0569322b056 (diff)
downloade2fsprogs-9290404ea7b135a1a0cc8d6518395e9a768087bf.tar.gz
Applied patch from Francois Petillon (fantec at proxad.net) to
avoid a file descriptor leak in the filefrag program.
-rw-r--r--misc/ChangeLog5
-rw-r--r--misc/filefrag.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/misc/ChangeLog b/misc/ChangeLog
index ea15bc94..214babff 100644
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-17 Theodore Ts'o <tytso@mit.edu>
+
+ * filefrag.c (frag_report): Applied patch from Francois Petillon
+ (fantec at proxad.net) to avoid a file descriptor leak.
+
2005-01-06 Theodore Ts'o <tytso@mit.edu>
* badblocks.c (alarm_intr): Increase the number of spaces reserved
diff --git a/misc/filefrag.c b/misc/filefrag.c
index e40941d5..086e1ce7 100644
--- a/misc/filefrag.c
+++ b/misc/filefrag.c
@@ -103,6 +103,7 @@ static void frag_report(const char *filename)
}
if (ioctl(fd, FIGETBSZ, &bs) < 0) {
perror("FIGETBSZ");
+ close(fd);
return;
}
if (verbose)
@@ -141,7 +142,7 @@ static void frag_report(const char *filename)
(expected>1) ? "s" : "");
else
fputc('\n', stdout);
-
+ close(fd);
}
static void usage(const char *progname)