diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2016-06-09 21:06:48 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2016-06-10 15:25:19 +0200 |
| commit | 49997ef025ee454283722a01210c169ca8910a98 (patch) | |
| tree | 58f2355cc6aacdfa0b3a375e545b3ec74d853086 /apt-pkg/contrib | |
| parent | 36feef0dc51c444de1449ba26a0bf2248716591d (diff) | |
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.
(cherry picked from commit 6f35be91c9e86e463bca7df6eadf05412c7b732c)
Diffstat (limited to 'apt-pkg/contrib')
| -rw-r--r-- | apt-pkg/contrib/fileutl.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index d880a725d..68298d785 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 @@ -1643,6 +1643,11 @@ public: res = LZ4F_freeDecompressionContext(dctx); dctx = nullptr; } + if (backend.IsOpen()) + { + backend.Close(); + filefd->iFd = -1; + } return LZ4F_isError(res) == false; } |