summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2012-04-19 11:12:07 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2012-04-19 11:12:07 +0200
commitc0df8a6255d0a23651fe6d0b8933b1a72dd97d4f (patch)
treed905ddfa8aabb13cfa2d372da4d3bc9b1f449ef4
parent6ddc1adf2d91536570c0683ee322e4e4260268f3 (diff)
releasing version 0.8.16~exp12ubuntu9
-rw-r--r--apt-inst/contrib/extracttar.cc2
-rw-r--r--debian/changelog9
2 files changed, 10 insertions, 1 deletions
diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc
index 12919a7cd..806ba796d 100644
--- a/apt-inst/contrib/extracttar.cc
+++ b/apt-inst/contrib/extracttar.cc
@@ -146,7 +146,7 @@ bool ExtractTar::StartGzip()
}
// Fix up our FDs
- InFd.Fd(Pipes[0]);
+ InFd.OpenDescriptor(Pipes[0], FileFd::ReadOnly, FileFd::None, true);
close(Pipes[1]);
return true;
}
diff --git a/debian/changelog b/debian/changelog
index 2b486330a..297fbdd7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+apt (0.8.16~exp12ubuntu9) precise; urgency=low
+
+ * apt-inst/contrib/extracttar.cc:
+ - ensure that in StartGzip the InFd is set to "AutoClose" to ensure
+ that the pipe is closed when InFd is closed. This fixes a Fd leak
+ (LP: #985452)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 19 Apr 2012 10:53:30 +0200
+
apt (0.8.16~exp12ubuntu8) precise; urgency=low
* Set FD_CLOEXEC on history.log's FD (Closes: #610069, LP: #636010)