* 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)

diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc
index 12919a7cd8bc9800fa6418cffb00a41e9e9671f3..806ba796d687833839b3f52020facfe68e40ce94 100644 (file)
--- 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 48b63784e0689be7aa6c3ccd0b7f56370e962391..50d6ea3cea49ec2abc4eb69bc3e056aae9882e87 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+apt (0.8.16~exp15) unstable; 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~exp14) UNRELEASED; urgency=low
 
   [ Michael Vogt ]