diff options
| author | Michael Vogt <mvo@debian.org> | 2013-07-24 22:06:18 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-07-24 22:06:18 +0200 |
| commit | f39daeb1f66b8910f91274055bf07c3d008cdc50 (patch) | |
| tree | 9283950ebf8a3089b8b16b1d09c3aec8ecc5eb07 /apt-inst/contrib | |
| parent | 267275c59cc35704789a228c6e9b1464c4cabd74 (diff) | |
| parent | c7a629dd114c41a1244744e2f5085df2f505dc90 (diff) | |
Merge remote-tracking branch 'upstream/debian/sid'
Diffstat (limited to 'apt-inst/contrib')
| -rw-r--r-- | apt-inst/contrib/arfile.cc | 3 | ||||
| -rw-r--r-- | apt-inst/contrib/extracttar.cc | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/apt-inst/contrib/arfile.cc b/apt-inst/contrib/arfile.cc index 2dee1a40d..d7ee528ba 100644 --- a/apt-inst/contrib/arfile.cc +++ b/apt-inst/contrib/arfile.cc @@ -106,7 +106,10 @@ bool ARArchive::LoadHeaders() return _error->Error(_("Invalid archive member header")); } if (File.Read(S,Len) == false) + { + delete Memb; return false; + } S[Len] = 0; Memb->Name = S; Memb->Size -= Len; diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc index 806ba796d..49ed5db56 100644 --- a/apt-inst/contrib/extracttar.cc +++ b/apt-inst/contrib/extracttar.cc @@ -63,7 +63,6 @@ ExtractTar::ExtractTar(FileFd &Fd,unsigned long Max,string DecompressionProgram) { GZPid = -1; - InFd = -1; Eof = false; } /*}}}*/ |