From 6f35be91c9e86e463bca7df6eadf05412c7b732c Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Thu, 9 Jun 2016 21:06:48 +0200
Subject: don't leak an FD in lz4 (de)compression

Seen first in #826783, but as this buglog also shows leaked uncompressed
files as well we don't close it just yet.
---
 apt-pkg/contrib/fileutl.cc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'apt-pkg/contrib')

diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 6bfa5ca92..94d1432cf 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -1535,7 +1535,7 @@ public:
 	 return false;
 
       unsigned int flags = (Mode & (FileFd::WriteOnly|FileFd::ReadOnly));
-      if (backend.OpenDescriptor(iFd, flags) == false)
+      if (backend.OpenDescriptor(iFd, flags, FileFd::None, true) == false)
 	 return false;
 
       // Write the file header
@@ -1646,6 +1646,11 @@ public:
 	 res = LZ4F_freeDecompressionContext(dctx);
 	 dctx = nullptr;
       }
+      if (backend.IsOpen())
+      {
+	 backend.Close();
+	 filefd->iFd = -1;
+      }
 
       return LZ4F_isError(res) == false;
    }
-- 
cgit v1.2.3